cleanup

diff --git a/ChangeLog b/ChangeLog
index 7e976860001538442d803471d448192708ed0084..51e9b3ef12dcaf5f966d832d2d6639195fa61e05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
 2009-12-16
 - Scrolling through tasks by schattenprinz (added action next_task and prev_task)
-- Andreas : *add* setting tooltip on clock
+- Andreas : *add* setting tooltip on clock with 'clock_tooltip = format'
 - Andreas : *add* changed everything to kernel timer for easier integration with new timer
 - Andreas : *add* multiple tasks can be urgent now
 - Thierry : panel snapshot

diff --git a/sample/black_single_desktop.tint2rc b/sample/black_single_desktop.tint2rc
index 63957c8a7b39f0ff0d191f287cd6f858c4350f9a..82e55f5bff8a8f198881be887c385f4e364cdb55 100644 (file)
--- a/sample/black_single_desktop.tint2rc
+++ b/sample/black_single_desktop.tint2rc
@@ -53,6 +53,7 @@ wm_menu = 1
 taskbar_mode = single_desktop
 taskbar_padding = 0 5 2
 taskbar_background_id = 0
+#taskbar_active_background_id = 0
 
 #---------------------------------------------
 # TASK
@@ -71,6 +72,7 @@ task_active_background_id = 3
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 7 8 5
 systray_background_id = 1
 systray_sort = left2right

diff --git a/sample/default.tint2rc b/sample/default.tint2rc
index df3fd74aba8825b7f14e964393a3263fcdd22107..dddd2a7aa5b00963774bf2db6fbb4ac3b9713cff 100644 (file)
--- a/sample/default.tint2rc
+++ b/sample/default.tint2rc
@@ -70,6 +70,7 @@ task_active_background_id = 3
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 8 4 5
 systray_background_id = 1
 systray_sort = left2right
@@ -98,6 +99,7 @@ clock_padding = 1 0
 clock_background_id = 1
 #clock_lclick_command = xclock
 clock_rclick_command = orage
+#clock_tooltip = %A %d %B
 
 #---------------------------------------------
 # TOOLTIP

diff --git a/sample/horizontal_icon_only.tint2rc b/sample/horizontal_icon_only.tint2rc
index ca231aa4eda34885ecf20d52653d7faed829cc2a..e0af81b66f2c4b430721b5d5c0c4800ee1ad322e 100644 (file)
--- a/sample/horizontal_icon_only.tint2rc
+++ b/sample/horizontal_icon_only.tint2rc
@@ -68,6 +68,7 @@ task_active_background_id = 3
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 8 6 5
 systray_background_id = 0
 systray_sort = left2right
@@ -96,6 +97,7 @@ clock_padding = 2 0
 clock_background_id = 0
 #clock_lclick_command = xclock
 clock_rclick_command = orage
+#clock_tooltip = %A %d %B
 
 #---------------------------------------------
 # TOOLTIP
@@ -104,7 +106,7 @@ tooltip = 1
 tooltip_padding = 2 2
 tooltip_show_timeout = 0.7
 tooltip_hide_timeout = 0.3
-tooltip_background_id = 4
+tooltip_background_id = 1
 tooltip_font_color = #OOOOOO 80
 tooltip_font = sans 10
 

diff --git a/sample/rounded_multi_desktop.tint2rc b/sample/rounded_multi_desktop.tint2rc
index 8994acb30fdf05c10f7ebb048c8fed1b68a227c6..30584c443a0a5abba7431d5e55f58e434f6d3fe1 100644 (file)
--- a/sample/rounded_multi_desktop.tint2rc
+++ b/sample/rounded_multi_desktop.tint2rc
@@ -65,9 +65,33 @@ task_active_background_id = 0
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 6 5 5
 systray_background_id =2
+systray_sort = left2right
 
+#---------------------------------------------
+# BATTERY
+#---------------------------------------------
+battery = 0
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #ffffff 76
+battery_padding = 1 0
+battery_background_id = 2
+
+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 1
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 3
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10
 
 #---------------------------------------------
 # MOUSE ACTION ON TASK

diff --git a/sample/tint2rc b/sample/tint2rc
index 20b0a718b4c016742bb425eea50698d21d3b6e60..1c321b57c33c2acb7f9ec845a360414aa84c92f5 100644 (file)
--- a/sample/tint2rc
+++ b/sample/tint2rc
@@ -39,13 +39,14 @@ wm_menu = 0
 taskbar_mode = single_desktop
 taskbar_padding = 2 3 2
 taskbar_background_id = 0
+#taskbar_active_background_id = 0
 
 #---------------------------------------------
 # TASKS
 #---------------------------------------------
 task_icon = 1
 task_text = 1
-task_width = 140
+task_maximum_size = 140 35
 task_centered = 1
 task_padding = 6 3
 task_font = sans 7
@@ -57,8 +58,10 @@ task_active_background_id = 2
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 0 4 5
 systray_background_id = 0
+systray_sort = left2right
 
 #---------------------------------------------
 # CLOCK
@@ -72,6 +75,7 @@ clock_padding = 1 0
 clock_background_id = 0
 #clock_lclick_command = xclock
 clock_rclick_command = orage
+#clock_tooltip = %A %d %B
 
 #---------------------------------------------
 # BATTERY
@@ -85,6 +89,16 @@ battery_font_color = #ffffff 76
 battery_padding = 1 0
 battery_background_id = 0
 
+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 0
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10
 
 #---------------------------------------------
 # MOUSE ACTION ON TASK

diff --git a/sample/vertical_icon_only.tint2rc b/sample/vertical_icon_only.tint2rc
index 8523e21a45bf7f54644c5430bca202d1eec8934c..ca9547e4891d45e93b3d7d457702cb4f2e984ea8 100644 (file)
--- a/sample/vertical_icon_only.tint2rc
+++ b/sample/vertical_icon_only.tint2rc
@@ -39,13 +39,14 @@ wm_menu = 0
 taskbar_mode = single_desktop
 taskbar_padding = 0 0 2
 taskbar_background_id = 3
+#taskbar_active_background_id = 0
 
 #---------------------------------------------
 # TASKS
 #---------------------------------------------
 task_icon = 1
 task_text = 0
-task_width = 50
+task_maximum_size = 50 35
 task_centered = 1
 task_padding = 0 2
 task_font = Aller 9
@@ -57,8 +58,10 @@ task_active_background_id = 1
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 2 8 0
 systray_background_id = 1
+systray_sort = left2right
 
 #---------------------------------------------
 # CLOCK
@@ -72,6 +75,7 @@ clock_padding = 6 4
 clock_background_id = 1
 #clock_lclick_command = xclock
 #clock_rclick_command = orage
+#clock_tooltip = %A %d %B
 
 #---------------------------------------------
 # BATTERY
@@ -85,6 +89,16 @@ battery_font_color = #ffffff 76
 battery_padding = 1 0
 battery_background_id = 0
 
+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 0
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10
 
 #---------------------------------------------
 # MOUSE ACTION ON TASK

diff --git a/sample/white_single_desktop.tint2rc b/sample/white_single_desktop.tint2rc
index 7f53210bde79cdb68ce0fe11a0a233a096f67adc..79cb39de57541d72aca1f44afe8602bc2857e667 100644 (file)
--- a/sample/white_single_desktop.tint2rc
+++ b/sample/white_single_desktop.tint2rc
@@ -43,7 +43,7 @@ panel_background_id = 3
 #---------------------------------------------
 task_icon = 0
 task_text = 1
-task_width = 100
+task_maximum_size = 100
 task_centered = 1
 task_margin = 4
 task_padding = 5
@@ -66,19 +66,22 @@ taskbar_active_background_id = 0
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 4 2 3
 systray_background_id = 0
+systray_sort = left2right
 
 #---------------------------------------------
 # CLOCK
 #---------------------------------------------
-time1_format = %H:%M / %a %d %b
+time1_format = %H:%M
 #time1_font = Museo 8
-time1_font = AvantGardeLTMedium 8
+time1_font = AvantGardeLTMedium 9 bold
 #time2_format = %A %d %B
 #time2_font = Monospace 6
 clock_font_color = #151515 60
 clock_padding = 4 0
+clock_tooltip = %A %d %B
 
 #---------------------------------------------
 # BATTERY
@@ -92,6 +95,17 @@ battery_font_color = #151515 60
 battery_padding = 1 0
 battery_background_id = 0
 
+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 1
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10
+
 #---------------------------------------------
 # MOUSE ACTION ON TASK
 #---------------------------------------------

diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 6d27ec06fc50c683502b73ce8ba5fd2279e0f512..fe8866225d319b2583789550c2332859ea392a0b 100644 (file)
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -102,7 +102,6 @@ void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
        }
        else if (!g_tooltip.mapped) {
                start_show_timeout();
-               //printf("!g_tooltip.mapped %d %d\n", x, y);
        }
 }
 

diff --git a/src/util/area.h b/src/util/area.h
index 5ddd0c3a95e773ba72814c2e05d33cb3195ce78b..a45b7b8e031e89c727d46a7535db95bd5f60a880 100644 (file)
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -50,7 +50,7 @@ typedef struct
 
 
 typedef struct {
-       // absolute coordinate in panel
+       // coordinate relative to panel window
        int posx, posy;
        // width and height including border
        int width, height;