X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=35141b06829593afece63cfed2a2b55b03c5960b;hb=f8bebb561d52fa25b320904bb0c6a08347d05611;hp=7c167d8ef3d9f9f8ed3c7ae3c95863c1c27d8b54;hpb=ad50533aef71e9697fe78bb636e64079f198f985;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index 7c167d8..35141b0 100644 --- a/src/tint.c +++ b/src/tint.c @@ -31,6 +31,7 @@ #include #include +#include "version.h" #include "server.h" #include "window.h" #include "config.h" @@ -41,6 +42,7 @@ #include "tooltip.h" #include "timer.h" + void signal_handler(int sig) { // signal handler is light as it should be @@ -52,6 +54,16 @@ void init (int argc, char *argv[]) { int i; + // set global data + default_timeout(); + default_systray(); + memset(&server, 0, sizeof(Server_global)); + default_battery(); + default_clock(); + default_taskbar(); + default_tooltip(); + default_config(); + // read options for (i = 1; i < argc; ++i) { if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) { @@ -59,7 +71,7 @@ void init (int argc, char *argv[]) exit(0); } if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) { - printf("tint2 version 0.8\n"); + printf("tint2 version %s\n", VERSION_STRING); exit(0); } if (!strcmp(argv[i], "-c")) { @@ -90,10 +102,6 @@ void init (int argc, char *argv[]) // sigaddset(&block_mask, SIGHUP); // sigaddset(&block_mask, SIGUSR1); // sigprocmask(SIG_BLOCK, &block_mask, 0); - - // set global data - memset(&server, 0, sizeof(Server_global)); - memset(&systray, 0, sizeof(Systraybar)); } void init_X11() @@ -139,6 +147,8 @@ void init_X11() void cleanup() { +printf("*** cleanup()\n"); + cleanup_timeout(); cleanup_systray(); stop_net(); cleanup_panel(); @@ -147,16 +157,15 @@ void cleanup() #ifdef ENABLE_BATTERY cleanup_battery(); #endif + cleanup_config(); if (default_icon) { imlib_context_set_image(default_icon); imlib_free_image(); } - if (config_path) g_free(config_path); - if (snapshot_path) g_free(snapshot_path); cleanup_server(); - XCloseDisplay(server.dsp); + if (server.dsp) XCloseDisplay(server.dsp); } @@ -164,9 +173,10 @@ void get_snapshot(const char *path) { Panel *panel = &panel1[0]; - if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap); - panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth); + if (panel->area.width > server.monitor[0].width) + panel->area.width = server.monitor[0].width; + panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth); refresh(&panel->area); Imlib_Image img = NULL; @@ -174,8 +184,14 @@ void get_snapshot(const char *path) img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0); imlib_context_set_image(img); + if (!panel_horizontal) { + // rotate 90° vertical panel + imlib_image_flip_horizontal(); + imlib_image_flip_diagonal(); + } imlib_save_image(path); imlib_free_image(); + XFreePixmap(server.dsp, panel->temp_pmap); } @@ -262,7 +278,7 @@ int tint2_handles_click(Panel* panel, XButtonEvent* e) if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP) return 1; if (click_clock(panel, e->x, e->y)) { - if ( (e->button == 1 && clock_lclick_command) || (e->button == 2 && clock_rclick_command) ) + if ( (e->button == 1 && clock_lclick_command) || (e->button == 3 && clock_rclick_command) ) return 1; else return 0; @@ -301,6 +317,60 @@ void event_button_press (XEvent *e) XLowerWindow (server.dsp, panel->main_win); } +void event_button_motion_notify (XEvent *e) +{ + Panel * panel = get_panel(e->xany.window); + if(!panel || !task_drag) + return; + + // Find the taskbar on the event's location + Taskbar * event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y); + if(event_taskbar == NULL) + return; + + // Find the task on the event's location + Task * event_task = click_task(panel, e->xbutton.x, e->xbutton.y); + + // If the event takes place on the same taskbar as the task being dragged + if(event_taskbar == task_drag->area.parent) { + // Swap the task_drag with the task on the event's location (if they differ) + if(event_task && event_task != task_drag) { + GSList * drag_iter = g_slist_find(event_taskbar->area.list, task_drag); + GSList * task_iter = g_slist_find(event_taskbar->area.list, event_task); + if(drag_iter && task_iter) { + gpointer temp = task_iter->data; + task_iter->data = drag_iter->data; + drag_iter->data = temp; + event_taskbar->area.resize = 1; + panel_refresh = 1; + task_dragged = 1; + } + } + } + else { // The event is on another taskbar than the task being dragged + if(task_drag->desktop == ALLDESKTOP || panel_mode != MULTI_DESKTOP) + return; + + Taskbar * drag_taskbar = (Taskbar*)task_drag->area.parent; + drag_taskbar->area.list = g_slist_remove(drag_taskbar->area.list, task_drag); + + if(event_taskbar->area.posx > drag_taskbar->area.posx || event_taskbar->area.posy > drag_taskbar->area.posy) + event_taskbar->area.list = g_slist_prepend(event_taskbar->area.list, task_drag); + else + event_taskbar->area.list = g_slist_append(event_taskbar->area.list, task_drag); + + // Move task to other desktop (but avoid the 'Window desktop changed' code in 'event_property_notify') + task_drag->area.parent = event_taskbar; + task_drag->desktop = event_taskbar->desktop; + + windows_set_desktop(task_drag->win, event_taskbar->desktop); + + event_taskbar->area.resize = 1; + drag_taskbar->area.resize = 1; + task_dragged = 1; + panel_refresh = 1; + } +} void event_button_release (XEvent *e) { @@ -309,6 +379,7 @@ void event_button_release (XEvent *e) if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) { forward_click(e); + XLowerWindow (server.dsp, panel->main_win); task_drag = 0; return; } @@ -351,17 +422,10 @@ void event_button_release (XEvent *e) } // drag and drop task - if (task_drag) { - if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) { - if (task_drag->desktop != ALLDESKTOP && panel_mode == MULTI_DESKTOP) { - windows_set_desktop(task_drag->win, tskbar->desktop); - if (tskbar->desktop == server.desktop) - set_active(task_drag->win); - task_drag = 0; - } - return; - } - else task_drag = 0; + if (task_dragged) { + task_drag = 0; + task_dragged = 0; + return; } // switch desktop @@ -380,7 +444,7 @@ void event_button_release (XEvent *e) void event_property_notify (XEvent *e) { - int i, j; + int i; Task *tsk; Window win = e->xproperty.window; Atom at = e->xproperty.atom; @@ -414,10 +478,10 @@ void event_property_notify (XEvent *e) // redraw both taskbar 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.bg = panel->g_taskbar.bg; panel->taskbar[old_desktop].area.resize = 1; } - panel->taskbar[server.desktop].area.is_active = 1; + panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active; panel->taskbar[server.desktop].area.resize = 1; panel_refresh = 1; } @@ -491,20 +555,10 @@ void event_property_notify (XEvent *e) // Window title changed if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) { - Task *tsk2; - GSList *l0; get_title(tsk); - // changed other tsk->title - for (i=0 ; i < nb_panel ; i++) { - for (j=0 ; j < panel1[i].nb_desktop ; j++) { - for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) { - tsk2 = l0->data; - if (tsk->win == tsk2->win && tsk != tsk2) { - tsk2->title = tsk->title; - tsk2->area.redraw = 1; - } - } - } + if (g_tooltip.mapped && (g_tooltip.area == (Area*)tsk)) { + tooltip_copy_text((Area*)tsk); + tooltip_update(); } panel_refresh = 1; } @@ -518,49 +572,17 @@ void event_property_notify (XEvent *e) panel_refresh = 1; } } -// We do not check for the iconified state, since it only unsets our active window -// but in openbox a shaded window is considered iconified. So we would loose the active window -// property on unshading it again (commented 01.10.2009) -// else if (at == server.atom.WM_STATE) { -// // Iconic state -// // TODO : try to delete following code -// if (window_is_iconified (win)) { -// if (task_active) { -// if (task_active->win == tsk->win) { -// Task *tsk2; -// GSList *l0; -// for (i=0 ; i < nb_panel ; i++) { -// for (j=0 ; j < panel1[i].nb_desktop ; j++) { -// for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) { -// tsk2 = l0->data; -// tsk2->area.is_active = 0; -// } -// } -// } -// task_active = 0; -// } -// } -// } -// } + else if (at == server.atom.WM_STATE) { + // Iconic state + int state = (task_active && tsk->win == task_active->win ? TASK_ACTIVE : TASK_NORMAL); + if (window_is_iconified(win)) + state = TASK_ICONIFIED; + set_task_state(tsk, state); + panel_refresh = 1; + } // Window icon changed else if (at == server.atom._NET_WM_ICON) { get_icon(tsk); - Task *tsk2; - GSList *l0; - for (i=0 ; i < nb_panel ; i++) { - for (j=0 ; j < panel1[i].nb_desktop ; j++) { - for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) { - tsk2 = l0->data; - if (tsk->win == tsk2->win && tsk != tsk2) { - tsk2->icon_width = tsk->icon_width; - tsk2->icon_height = tsk->icon_height; - tsk2->icon = tsk->icon; - tsk2->icon_active = tsk->icon_active; - tsk2->area.redraw = 1; - } - } - } - } panel_refresh = 1; } // Window desktop changed @@ -632,15 +654,10 @@ void event_configure_notify (Window win) Panel *p = tsk->area.panel; if (p->monitor != window_get_monitor (win)) { remove_task (tsk); - add_task (win); + tsk = add_task (win); if (win == window_get_active ()) { - GSList* task_list = task_get_tasks(win); - while (task_list) { - Task *tsk = task_list->data; - tsk->area.is_active = 1; - task_active = tsk; - task_list = task_list->next; - } + set_task_state(tsk, TASK_ACTIVE); + task_active = tsk; } panel_refresh = 1; } @@ -680,6 +697,7 @@ void dnd_message(XClientMessageEvent *e) int main (int argc, char *argv[]) { XEvent e; + XClientMessageEvent *ev; fd_set fdset; int x11_fd, i; Panel *panel; @@ -688,6 +706,8 @@ int main (int argc, char *argv[]) init (argc, argv); init_config(); + init_X11(); + i = 0; if (config_path) i = config_read_file (config_path); @@ -699,7 +719,6 @@ int main (int argc, char *argv[]) exit(1); } - init_X11(); init_panel(); cleanup_config(); if (snapshot_path) { @@ -720,16 +739,13 @@ int main (int argc, char *argv[]) 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); - } for (i=0 ; i < nb_panel ; i++) { panel = &panel1[i]; - if (panel->is_hidden) + if (panel->is_hidden) { XCopyArea(server.dsp, panel->hidden_pixmap, panel->main_win, server.gc, 0, 0, panel->hidden_width, panel->hidden_height, 0, 0); + XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->hidden_pixmap); + } else { if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap); panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth); @@ -740,9 +756,8 @@ int main (int argc, char *argv[]) XFlush (server.dsp); panel = (Panel*)systray.area.panel; - if (refresh_systray && !panel->is_hidden) { + if (refresh_systray && panel && !panel->is_hidden) { refresh_systray = 0; - panel = (Panel*)systray.area.panel; // tint2 doen't draw systray icons. it just redraw background. XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap); // force icon's refresh @@ -786,6 +801,10 @@ int main (int argc, char *argv[]) break; case MotionNotify: { + unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask; + if (e.xmotion.state & button_mask) + event_button_motion_notify (&e); + if (!g_tooltip.enabled) break; Panel* panel = get_panel(e.xmotion.window); Area* area = click_area(panel, e.xmotion.x, e.xmotion.y); @@ -805,11 +824,6 @@ int main (int argc, char *argv[]) event_expose(&e); break; - case MapNotify: - if (e.xany.window == g_tooltip.window) - tooltip_update(); - break; - case PropertyNotify: event_property_notify(&e); break; @@ -828,6 +842,11 @@ int main (int argc, char *argv[]) break; case UnmapNotify: case DestroyNotify: + if (e.xany.window == server.composite_manager) { + // TODO: Stop real_transparency + //signal_pending = SIGUSR2; + break; + } if (e.xany.window == g_tooltip.window || !systray.area.on_screen) break; for (it = systray.list_icons; it; it = g_slist_next(it)) { @@ -839,6 +858,17 @@ int main (int argc, char *argv[]) break; case ClientMessage: + ev = &e.xclient; + if (ev->data.l[1] == server.atom._NET_WM_CM_S0) { + if (ev->data.l[2] == None) + // TODO: Stop real_transparency + //signal_pending = SIGUSR2; + ; + else + // TODO: Start real_transparency + //signal_pending = SIGUSR2; + ; + } if (!systray.area.on_screen) break; if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) { net_message(&e.xclient); @@ -849,9 +879,20 @@ int main (int argc, char *argv[]) break; default: - if (e.type == XDamageNotify+damage_event) - // TODO: update only the damaged icon, not all of them - systray.area.redraw = 1; + if (e.type == XDamageNotify+damage_event) { + // union needed to avoid strict-aliasing warnings by gcc + union { XEvent e; XDamageNotifyEvent de; } event_union = {.e=e}; + TrayWindow *traywin; + GSList *l; + XDamageNotifyEvent* de = &event_union.de; + for (l = systray.list_icons; l ; l = l->next) { + traywin = (TrayWindow*)l->data; + if ( traywin->id == de->drawable ) { + systray_render_icon(traywin); + break; + } + } + } } } }