X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=28366cc9a57515c69ae30a9338f2e213dac302bb;hb=1611dbe84b2dbf03cd4dfe857a24d1b564e7fb91;hp=13e380fdd1c78c67e629bae633a3c4b196dfad9f;hpb=e9f82fb210675167061fd45697f49e6eb733c732;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index 13e380f..28366cc 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -55,6 +55,7 @@ void init ()
 
    // set global data
    memset(&server, 0, sizeof(Server_global));
+   memset(&systray, 0, sizeof(Systraybar));
 
    server.dsp = XOpenDisplay (NULL);
    if (!server.dsp) {
@@ -91,6 +92,13 @@ void cleanup()
    if (time2_font_desc) pango_font_description_free(time2_font_desc);
    if (time1_format) g_free(time1_format);
    if (time2_format) g_free(time2_format);
+   if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
+   if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
+	if (battery_low_cmd) g_free(battery_low_cmd);
+	if (path_energy_now) g_free(path_energy_now);
+	if (path_energy_full) g_free(path_energy_full);
+	if (path_current_now) g_free(path_current_now);
+	if (path_status) g_free(path_status);
 
    if (server.monitor) free(server.monitor);
    XFreeGC(server.dsp, server.gc);
@@ -135,10 +143,10 @@ void event_button_press (XEvent *e)
    GSList *l0;
    Taskbar *tskbar;
    int x = e->xbutton.x;
-   int y = e->xbutton.y;
+   //int y = e->xbutton.y; // unused
    for (l0 = panel->area.list; l0 ; l0 = l0->next) {
       tskbar = l0->data;
-      if (!tskbar->area.visible) continue;
+      if (!tskbar->area.on_screen) continue;
       if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
          break;
    }
@@ -167,7 +175,7 @@ void event_button_release (XEvent *e)
 
    int action = TOGGLE_ICONIFY;
    int x = e->xbutton.x;
-   int y = e->xbutton.y;
+   //int y = e->xbutton.y; // unused
    switch (e->xbutton.button) {
       case 2:
          action = mouse_middle;
@@ -188,7 +196,7 @@ void event_button_release (XEvent *e)
    GSList *l0;
    for (l0 = panel->area.list; l0 ; l0 = l0->next) {
       tskbar = l0->data;
-      if (!tskbar->area.visible) continue;
+      if (!tskbar->area.on_screen) continue;
       if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
          goto suite;
    }
@@ -401,6 +409,37 @@ void event_property_notify (XEvent *e)
 }
 
 
+void event_expose (XEvent *e)
+{
+   Panel *panel;
+
+	panel = get_panel(e->xany.window);
+	if (!panel) return;
+/*
+	if (systray.area.on_screen) {
+		// force trayer refresh
+		//XClearWindow(tray_data.dpy, ti->mid_parent);
+		//x11_send_visibility(tray_data.dpy, dst, VisibilityFullyObscured);
+		//x11_send_visibility(tray_data.dpy, dst, VisibilityUnobscured);
+
+		GSList *l;
+		TrayWindow *traywin;
+		for (l = systray.list_icons; l ; l = l->next) {
+			traywin = (TrayWindow*)l->data;
+			// send Expose event
+			XClearArea(server.dsp, traywin->id, 0, 0, systray.area.width, systray.area.height, True);
+			//printf("expose %lx\n", traywin->id);
+		}
+
+		//x11_refresh_window(tray_data.dpy, ti->wid, ti->l.wnd_sz.x, ti->l.wnd_sz.y, True);
+	}
+*/
+   panel_refresh = 1;
+	//XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+
+}
+
+
 void event_configure_notify (Window win)
 {
    if (panel_mode != SINGLE_MONITOR) return;
@@ -434,15 +473,20 @@ void event_timer()
 
    if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return;
 
-   // update clock
-   time_clock.tv_sec = stv.tv_sec;
-   time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+	// update battery
+	if (panel1[0].battery.area.on_screen)
+		update_battery(&battery_state);
+
+	// update clock
+	time_clock.tv_sec = stv.tv_sec;
+	time_clock.tv_sec -= time_clock.tv_sec % time_precision;
 
 	int i;
 	for (i=0 ; i < nb_panel ; i++) {
 	   panel1[i].clock.area.resize = 1;
+		panel1[i].battery.area.resize = 1;
 	}
-   panel_refresh = 1;
+	panel_refresh = 1;
 }
 
 
@@ -453,6 +497,7 @@ int main (int argc, char *argv[])
    int x11_fd, i, c;
    struct timeval tv;
    Panel *panel;
+	GSList *it;
 
    c = getopt (argc, argv, "c:");
    init ();
@@ -495,17 +540,15 @@ load_config:
                   break;
 
                case ButtonRelease:
-                  event_button_release (&e);
+                  event_button_release(&e);
                   break;
 
                case Expose:
-               	panel = get_panel(e.xany.window);
-               	if (!panel) break;
-                  XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+               	event_expose(&e);
                   break;
 
                case PropertyNotify:
-                  event_property_notify (&e);
+                  event_property_notify(&e);
                   break;
 
                case ConfigureNotify:
@@ -517,18 +560,17 @@ load_config:
 
 					case UnmapNotify:
 					case DestroyNotify:
-//	printf("destroy client\n");
-					/*
-						GSList *it;
-						for (it = icons; it; it = g_slist_next(it)) {
+						if (!systray.area.on_screen) break;
+						for (it = systray.list_icons; it; it = g_slist_next(it)) {
 							if (((TrayWindow*)it->data)->id == e.xany.window) {
-								icon_remove(it);
+								remove_icon((TrayWindow*)it->data);
 								break;
 							}
-						}*/
+						}
 					break;
 
 					case ClientMessage:
+						if (!systray.area.on_screen) break;
 						//printf("ClientMessage\n");
 						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);
@@ -557,7 +599,7 @@ load_config:
 				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);
 
-			 	refresh(panel);
+			 	refresh(&panel->area);
 			   XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
 			}
 			XFlush (server.dsp);