X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=e51a69573db36998f77970fe4008975b3c4be346;hb=e7c43073246afe07cddf67d40d545f2bebcf62a1;hp=5e06fff0ef824cc89654a8af4a90f3b84278c0db;hpb=b31d9b760bce27b61ff0c7c7d39278b571b7b635;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index 5e06fff..e51a695 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -134,6 +134,7 @@ void init_panel()
 
 	init_tooltip();
 	init_systray();
+	init_launcher();
 	init_clock();
 #ifdef ENABLE_BATTERY
 	init_battery();
@@ -162,6 +163,7 @@ void init_panel()
 		p->area.panel = p;
 		p->area.on_screen = 1;
 		p->area.resize = 1;
+		p->area.size_mode = SIZE_BY_LAYOUT;
 		p->area._resize = resize_panel;
 		p->g_taskbar.area.parent = p;
 		p->g_taskbar.area.panel = p;
@@ -178,6 +180,10 @@ void init_panel()
 			p->area.list = g_slist_append(p->area.list, &p->battery);
 		}
 #endif
+		if (launcher_enabled) {
+			init_launcher_panel(p);
+			p->area.list = g_slist_append(p->area.list, &p->launcher);
+		}
 		// systray only on first panel
 		if (systray.area.on_screen && i == 0) {
 			init_systray_panel(p);
@@ -295,9 +301,10 @@ void init_panel_size_and_position(Panel *panel)
 }
 
 
-void resize_panel(void *obj)
+int resize_panel(void *obj)
 {
 	Panel *panel = (Panel*)obj;
+//printf("resize_panel : taskbar\n");
 
 	if (panel_horizontal) {
 		int taskbar_width, modulo_width = 0;
@@ -305,6 +312,8 @@ void resize_panel(void *obj)
 		taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.bg->border.width);
 		if (panel->clock.area.on_screen && panel->clock.area.width)
 			taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
+		if (panel->launcher.area.on_screen && panel->launcher.area.width)
+			taskbar_width -= (panel->launcher.area.width + panel->area.paddingx);
 	#ifdef ENABLE_BATTERY
 		if (panel->battery.area.on_screen && panel->battery.area.width)
 			taskbar_width -= (panel->battery.area.width + panel->area.paddingx);
@@ -322,6 +331,8 @@ void resize_panel(void *obj)
 		// change posx and width for all taskbar
 		int i, posx;
 		posx = panel->area.bg->border.width + panel->area.paddingxlr;
+		if (panel->launcher.area.on_screen && panel->launcher.area.width)
+			posx += (panel->launcher.area.width + panel->area.paddingx);
 		for (i=0 ; i < panel->nb_desktop ; i++) {
 			panel->taskbar[i].area.posx = posx;
 			panel->taskbar[i].area.width = taskbar_width;
@@ -342,6 +353,8 @@ void resize_panel(void *obj)
 		taskbar_height = panel->area.height - (2 * panel->area.paddingxlr) - (2 * panel->area.bg->border.width);
 		if (panel->clock.area.on_screen && panel->clock.area.height)
 			taskbar_height -= (panel->clock.area.height + panel->area.paddingx);
+		if (panel->launcher.area.on_screen && panel->launcher.area.height)
+			taskbar_height -= (panel->launcher.area.height + panel->area.paddingx);
 	#ifdef ENABLE_BATTERY
 		if (panel->battery.area.on_screen && panel->battery.area.height)
 			taskbar_height -= (panel->battery.area.height + panel->area.paddingx);
@@ -351,6 +364,8 @@ void resize_panel(void *obj)
 			taskbar_height -= (systray.area.height + panel->area.paddingx);
 
 		posy = panel->area.height - panel->area.bg->border.width - panel->area.paddingxlr - taskbar_height;
+		if (panel->launcher.area.on_screen && panel->launcher.area.height)
+			posy -= (panel->launcher.area.height + panel->area.paddingx);
 		if (panel_mode == MULTI_DESKTOP) {
 			int height = taskbar_height - ((panel->nb_desktop-1) * panel->area.paddingx);
 			taskbar_height = height / panel->nb_desktop;
@@ -370,6 +385,7 @@ void resize_panel(void *obj)
 				posy += panel->taskbar[i].area.height + panel->area.paddingx;
 		}
 	}
+	return 0;
 }
 
 
@@ -495,7 +511,7 @@ void set_panel_properties(Panel *p)
 	XChangeProperty(server.dsp, p->main_win, server.atom._MOTIF_WM_HINTS, server.atom._MOTIF_WM_HINTS, 32, PropModeReplace, (unsigned char *) prop, 5);
 
 	// XdndAware - Register for Xdnd events
-	long version=5;
+	Atom version=4;
 	XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
 
 	update_strut(p);
@@ -565,12 +581,14 @@ void set_panel_background(Panel *p)
 	}
 
 	// redraw panel's object
+	//p->area.redraw = 1;
 	GSList *l0;
 	Area *a;
 	for (l0 = p->area.list; l0 ; l0 = l0->next) {
 		a = l0->data;
 		set_redraw(a);
 	}
+	
 	// reset task 'state_pix'
 	int i;
 	Taskbar *tskbar;
@@ -647,6 +665,43 @@ Task *click_task (Panel *panel, int x, int y)
 }
 
 
+Launcher *click_launcher (Panel *panel, int x, int y)
+{
+	Launcher *launcher = &panel->launcher;
+	
+	if (panel_horizontal) {
+		if (launcher->area.on_screen && x >= launcher->area.posx && x <= (launcher->area.posx + launcher->area.width))
+			return launcher;
+	}
+	else {
+		if (launcher->area.on_screen && y >= launcher->area.posy && y <= (launcher->area.posy + launcher->area.height))
+			return launcher;
+	}
+	return NULL;
+}
+
+
+LauncherIcon *click_launcher_icon (Panel *panel, int x, int y)
+{
+	GSList *l0;
+	Launcher *launcher;
+
+	//printf("Click x=%d y=%d\n", x, y);
+	if ( (launcher = click_launcher(panel, x, y)) ) {
+		LauncherIcon *icon;
+		for (l0 = launcher->list_icons; l0 ; l0 = l0->next) {
+			icon = l0->data;
+			if (x >= (launcher->area.posx + icon->x) && x <= (launcher->area.posx + icon->x + icon->icon_size) &&
+				y >= (launcher->area.posy + icon->y) && y <= (launcher->area.posy + icon->y + icon->icon_size)) {
+				//printf("Hit rect x=%d y=%d xmax=%d ymax=%d\n", launcher->area.posx + icon->x, launcher->area.posy + icon->y, launcher->area.posx + icon->x + icon->width, launcher->area.posy + icon->y + icon->height);
+				return icon;
+			}
+		}
+	}
+	return NULL;
+}
+
+
 int click_padding(Panel *panel, int x, int y)
 {
 	if (panel_horizontal) {