#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) {
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 (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;
}
}
}