#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/Xlocale.h>
+#include <X11/extensions/Xdamage.h>
#include <Imlib2.h>
#include <signal.h>
printf("tint2 version 0.8\n");
exit(0);
}
- if (!strcmp(argv[i], "-c")) {
+ if (!strcmp(argv[i], "-c")) {
i++;
if (i < argc)
config_path = strdup(argv[i]);
// set global data
memset(&server, 0, sizeof(Server_global));
- memset(&systray, 0, sizeof(Systraybar));
+// memset(&systray, 0, sizeof(Systraybar));
server.dsp = XOpenDisplay (NULL);
if (!server.dsp) {
server_init_atoms ();
server.screen = DefaultScreen (server.dsp);
server.root_win = RootWindow(server.dsp, server.screen);
- server.depth = DefaultDepth (server.dsp, server.screen);
- server.visual = DefaultVisual (server.dsp, server.screen);
server.desktop = server_get_current_desktop ();
- XGCValues gcv;
- server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv);
-
+ server_init_visual();
XSetErrorHandler ((XErrorHandler) server_catch_error);
imlib_context_set_display (server.dsp);
imlib_context_set_visual (server.visual);
- imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen));
+ imlib_context_set_colormap (server.colormap);
/* Catch events */
XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
if (config_path) g_free(config_path);
if (snapshot_path) g_free(snapshot_path);
- if (server.monitor) free(server.monitor);
- XFreeGC(server.dsp, server.gc);
+ cleanup_server();
XCloseDisplay(server.dsp);
}
Panel *panel = &panel1[i];
if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
// redraw both taskbar
- panel->taskbar[old_desktop].area.is_active = 0;
- panel->taskbar[old_desktop].area.resize = 1;
+ if (server.nb_desktop > old_desktop) {
+ // can happen if last desktop is deleted and we've been on the last desktop
+ panel->taskbar[old_desktop].area.is_active = 0;
+ panel->taskbar[old_desktop].area.resize = 1;
+ }
panel->taskbar[server.desktop].area.is_active = 1;
panel->taskbar[server.desktop].area.resize = 1;
panel_refresh = 1;
Taskbar *tskbar;
Task *tsk;
GSList *l;
- tskbar = &panel->taskbar[old_desktop];
- for (l = tskbar->area.list; l ; l = l->next) {
- tsk = l->data;
- if (tsk->desktop == ALLDESKTOP) {
- tsk->area.on_screen = 0;
- tskbar->area.resize = 1;
- panel_refresh = 1;
+ if (server.nb_desktop > old_desktop) {
+ tskbar = &panel->taskbar[old_desktop];
+ for (l = tskbar->area.list; l ; l = l->next) {
+ tsk = l->data;
+ if (tsk->desktop == ALLDESKTOP) {
+ tsk->area.on_screen = 0;
+ tskbar->area.resize = 1;
+ panel_refresh = 1;
+ }
}
}
tskbar = &panel->taskbar[server.desktop];
GSList *l;
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
- if (traywin->id == win) {
+ if (traywin->tray_id == win) {
//printf("move tray %d\n", traywin->x);
XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
+ XResizeWindow(server.dsp, traywin->tray_id, traywin->width, traywin->height);
panel_refresh = 1;
return;
}
GSList *it;
const struct timespec* timeout;
- init (argc, argv);
-
- i = 0;
init_config();
+ i = 0;
if (config_path)
i = config_read_file (config_path);
else
cleanup();
exit(1);
}
+
+ init (argc, argv);
+
init_panel();
cleanup_config();
if (snapshot_path) {
exit(0);
}
+ int damage_event, damage_error;
+ XDamageQueryExtension(server.dsp, &damage_event, &damage_error);
x11_fd = ConnectionNumber(server.dsp);
XSync(server.dsp, False);
if (panel_refresh) {
panel_refresh = 0;
+ // QUESTION: do we need this first refresh_systray, because we check refresh_systray once again later...
if (refresh_systray) {
panel = (Panel*)systray.area.panel;
XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);
if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
break;
for (it = systray.list_icons; it; it = g_slist_next(it)) {
- if (((TrayWindow*)it->data)->id == e.xany.window) {
+ if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
remove_icon((TrayWindow*)it->data);
break;
}
dnd_message(&e.xclient);
}
break;
+
+ default:
+ if (e.type == XDamageNotify+damage_event)
+ systray.area.redraw = 1;
}
}
}