/**************************************************************************
* Tint2 : systraybar
*
-* Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
* based on 'docker-1.5' from Ben Jansens.
*
* This program is free software; you can redistribute it and/or
{
systray.area.parent = p;
systray.area.panel = p;
-
+ if (systray.area.bg == 0)
+ systray.area.bg = &g_array_index(backgrounds, Background, 0);
+
GSList *l;
int count = 0;
for (l = systray.list_icons; l ; l = l->next) {
void on_change_systray (void *obj)
{
- // here, sysbar's position is defined. so we can calculate position of tray icon.
+ // here, systray.area.posx/posy are defined by rendering engine. so we can calculate position of tray icon.
Systraybar *sysbar = obj;
Panel *panel = sysbar->area.panel;
int i, posx, posy;
- int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +sysbar->marging/2;
+ int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy + sysbar->marging/2;
if (panel_horizontal) {
posy = start;
posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
traywin->y = posy;
traywin->x = posx;
+ //printf("systray %d : %d,%d\n", i, posx, posy);
traywin->width = sysbar->icon_size;
traywin->height = sysbar->icon_size;
if (panel_horizontal) {
parent_window = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, visual, mask, &set_attr);
old = XSetErrorHandler(window_error_handler);
XReparentWindow(server.dsp, id, parent_window, 0, 0);
+ // watch for the icon trying to resize itself / closing again!
+ XSelectInput(server.dsp, id, StructureNotifyMask);
XSync(server.dsp, False);
XSetErrorHandler(old);
if (error != FALSE) {
systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
//printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
- // watch for the icon trying to resize itself!
- XSelectInput(server.dsp, traywin->tray_id, StructureNotifyMask);
if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportRawRectangles);
XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual);
// we made also sure, that we always have a 32 bit visual, i.e. we can safely create 32 bit pixmaps here
TrayWindow* traywin = t;
traywin->render_timeout = 0;
+ if ( traywin->width == 0 || traywin->height == 0 ) {
+ // reschedule rendering since the geometry information has not yet been processed (can happen on slow cpu)
+ systray_render_icon(traywin);
+ return;
+ }
// good systray icons support 32 bit depth, but some icons are still 24 bit.
// We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and