From: Hugo Villeneuve Date: Sun, 2 Jun 2013 12:17:15 +0000 (-0400) Subject: Using separate masks for clock and calendar modes X-Git-Tag: v1.1.0~19 X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=6ac17cdfa573454c2522b986473d392efc8a6831;p=dockapps%2Fhvclock.git Using separate masks for clock and calendar modes --- diff --git a/pixmaps/calendar-mask.xpm b/pixmaps/calendar-mask.xpm new file mode 100644 index 0000000..1392d1f --- /dev/null +++ b/pixmaps/calendar-mask.xpm @@ -0,0 +1,69 @@ +/* XPM */ +static char * calendar_mask_xpm[] = { +"64 64 2 1", +" c None", +". c #000000", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" .......................................... ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/pixmaps/clock-mask.xpm b/pixmaps/clock-mask.xpm new file mode 100644 index 0000000..19084cc --- /dev/null +++ b/pixmaps/clock-mask.xpm @@ -0,0 +1,184 @@ +/* XPM */ +static char * clock_mask_xpm[] = { +"64 64 117 2", +" c None", +". c #737584", +"+ c #5A5963", +"@ c #42454A", +"# c #313439", +"$ c #293031", +"% c #212429", +"& c #42414A", +"* c #525963", +"= c #6B6D7B", +"- c #84828C", +"; c #4A4D52", +"> c #000400", +", c #000000", +"' c #212021", +") c #292C29", +"! c #393839", +"~ c #4A4552", +"{ c #5A5D6B", +"] c #393C39", +"^ c #848284", +"/ c #BDBABD", +"( c #DEDFDE", +"_ c #FFFFFF", +": c #FFFBFF", +"< c #525552", +"[ c #7B7D7B", +"} c #52555A", +"| c #94929C", +"1 c #52515A", +"2 c #101010", +"3 c #424142", +"4 c #A5A2A5", +"5 c #F7F3F7", +"6 c #E7E7E7", +"7 c #080C10", +"8 c #4A4952", +"9 c #63656B", +"0 c #5A5D5A", +"a c #D6D7D6", +"b c #B5B2B5", +"c c #5A595A", +"d c #525563", +"e c #292829", +"f c #ADAAAD", +"g c #848684", +"h c #525152", +"i c #313431", +"j c #6B696B", +"k c #4A494A", +"l c #EFEBEF", +"m c #ADA6AD", +"n c #080C08", +"o c #9C9E9C", +"p c #4A4D4A", +"q c #CECBCE", +"r c #737573", +"s c #E7E3E7", +"t c #6B6D6B", +"u c #312C31", +"v c #DEDBDE", +"w c #FFF7FF", +"x c #101410", +"y c #F7F7F7", +"z c #393C42", +"A c #424542", +"B c #636563", +"C c #393842", +"D c #7B797B", +"E c #6B6D73", +"F c #737173", +"G c #212421", +"H c #313031", +"I c #A5A6A5", +"J c #292C31", +"K c #8C8A8C", +"L c #212821", +"M c #D6D3D6", +"N c #212029", +"O c #B5BAB5", +"P c #BDBEBD", +"Q c #C6C7C6", +"R c #293029", +"S c #424952", +"T c #EFEFEF", +"U c #424942", +"V c #181C21", +"W c #949294", +"X c #5A615A", +"Y c #B5B6B5", +"Z c #A5AAA5", +"` c #949694", +" . c #181C18", +".. c #737973", +"+. c #949A94", +"@. c #636163", +"#. c #ADAEAD", +"$. c #292429", +"%. c #4A514A", +"&. c #181818", +"*. c #9C9A9C", +"=. c #525952", +"-. c #9CA29C", +";. c #212829", +">. c #313039", +",. c #39414A", +"'. c #4A515A", +"). c #E7EBE7", +"!. c #636963", +"~. c #CECFCE", +"{. c #8C8E8C", +"]. c #394139", +"^. c #393442", +"/. c #C6CBC6", +"(. c #080808", +"_. c #C6C3C6", +":. c #393C4A", +" ", +" ", +" . + @ # $ % % $ # & * = ", +" - ; % > , , > ' ) ! ! ) ' > , , > % ~ ", +" { % , > ] ^ / ( _ _ : < < _ _ _ ( / [ ] > , ' } ", +" | 1 2 , 3 4 5 _ _ _ _ _ _ 6 , , 6 _ _ _ _ _ _ 5 4 3 , 7 8 ", +" 9 2 , 0 a _ _ _ _ _ _ _ _ _ _ b b _ _ _ _ _ _ _ _ _ _ a c , 7 d ", +" e , ] f 5 _ _ _ _ _ _ _ : g > h _ i j ! k l _ _ _ _ _ _ _ 5 m ] , % ", +" = 7 n 4 o , p _ _ _ _ _ _ _ q q , h _ r _ s , t _ _ _ _ _ _ _ k , o 4 n n ", +" } , u v _ / > t _ _ _ _ _ _ _ _ _ , h _ _ _ 5 , j _ _ _ _ _ _ _ j > / _ v u , 8 ", +" @ , < : _ _ _ w g > h : g > h _ _ _ , h _ _ _ o x v _ _ _ : g > h _ : _ _ _ y < , z ", +" @ , j _ _ _ _ _ q q , h q q , h _ _ _ , h _ _ / A ( _ _ _ _ q q , h _ _ _ _ _ _ _ B , C ", +" } , j _ _ _ _ _ _ _ _ , h _ _ , h _ _ _ , h _ D p q q t _ _ _ _ _ , h _ _ _ _ _ _ _ _ j , 8 ", +" E , < _ _ _ _ _ _ _ _ _ , h _ _ , h _ s F , G [ , , , , h _ _ _ _ _ , h _ _ _ ( _ _ _ _ _ p , + ", +" 7 H : _ _ _ _ _ _ _ _ _ , h _ _ , h _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ , h _ _ [ G I _ _ _ _ y J n E ", +" e n v _ _ _ _ _ _ _ _ _ _ , h _ _ , h _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ , h _ K G L M _ _ _ _ _ v n N ", +" 9 , 4 _ _ _ _ _ _ _ _ _ s F , G r F , G g _ _ _ _ _ _ _ _ _ _ _ _ _ s F , G 0 G G O _ _ _ _ _ _ _ o , 1 ", +" 2 ] o / _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ P G G I _ _ _ _ _ _ _ / o ! 7 ", +" 1 , f , > w g > h _ 6 3 t 3 6 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Q ) G K _ _ i j ! k l : > , f , & ", +" 2 c 5 p t q q , h _ c ] _ ] c _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ v R G r _ _ _ r _ s , t _ j p 5 c 7 ", +" { , a _ _ _ _ _ , h _ x h _ p x _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 6 ] G B _ _ _ _ _ _ 5 , j _ _ _ _ M , S ", +" % 3 _ _ _ _ _ _ , h _ , h _ h , _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ T U G h y _ _ _ _ _ _ o x v _ _ _ _ _ 3 V ", +" , 4 _ _ _ _ _ _ , h _ 2 h _ p x _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ y h G A T _ _ _ _ _ _ / A ( _ _ _ _ _ _ o , ", +" ; > y _ _ _ _ _ _ , h _ < ] _ ] < _ _ _ _ _ _ _ _ _ _ _ _ _ _ < l _ _ B G ] 6 _ _ _ _ _ _ D p q q t _ _ _ _ _ 5 > z ", +" % ] _ _ _ _ _ s F , G g s ] j ] s _ _ _ _ _ _ _ _ _ _ _ _ _ v L 5 _ [ G R v _ _ _ _ _ _ T , , , , h _ _ _ _ _ _ ! V ", +" > ^ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ W X _ K G L Q _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ [ > ", +" . , Y _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ k Z I G G / _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Y , d ", +" { , ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ( G b G G I _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ( , @ ", +" @ > _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ` p L G K _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ > # ", +" # ._ _ _ _ P G < A s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ` p L G G .._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ c F ] i v _ _ _ _ .e ", +" J ) : 6 _ _ G , 5 A h _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.G G G G A _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ P _ T , @._ _ 6 : ) N ", +" e ! < , b _ > , _ h 2 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ p G j B G U _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ a , ^ _ #., < ! V ", +" $.! < , b _ i , l ! > _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ %.G B B G G 4 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ f &.A : _ #., < ! V ", +" J ) _ 6 _ _ v < j e ._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ *.G G G G G G =.s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ M , [ _ _ 6 _ ) N ", +" # ._ _ _ _ Q : _ ) t _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ j ) U 3 G G G ) -._ _ _ _ _ _ _ _ _ _ _ _ B _ T , @._ _ _ _ .;. ", +" & > _ _ _ _ ^ h 0 < 5 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 0 ` _ _ Z R G G G < ( _ _ _ _ _ _ _ _ _ _ ] t ] ! v _ _ _ _ > >. ", +" + , ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ T G ( _ _ _ 6 @.G G G ) o _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ( , ,. ", +" = , Y _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Z k _ _ _ _ _ _ #.R G G G < ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Y , '. ", +" > [ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ X W _ _ _ _ _ _ _ ).B G G G e +._ _ _ _ _ _ _ _ _ _ _ _ _ _ [ > ", +" % ] _ _ _ _ _ _ Y ) c ! B _ _ _ _ _ _ _ _ _ _ _ _ 5 L v _ _ _ _ _ _ _ _ _ #.H G G G G s _ _ f , h _ _ _ _ _ _ _ ! V ", +" 8 > 5 _ _ _ _ _ 2 , : 4 , Y _ _ _ _ _ _ _ _ _ _ _ #.A _ _ _ _ _ _ _ _ _ _ _ l !.G G G F _ s h , h _ _ _ _ _ _ 5 > # ", +" , 4 _ _ _ _ _ i , T *., ~._ _ _ _ _ _ _ _ _ _ _ B {._ _ _ _ _ _ _ _ _ _ _ _ _ b i G *._ h s , h _ _ _ _ _ _ o , * ", +" ' 3 _ _ _ _ _ ( ' A ' D _ _ _ _ _ _ _ _ _ _ _ y e M _ _ _ _ _ _ _ _ _ _ _ _ _ _ : 6 _ K I _ , h _ _ _ _ _ _ 3 &. ", +" } , M _ _ _ _ H , 5 o , M _ _ _ _ _ _ _ _ _ _ Y ]._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ] B B , ' K _ _ _ _ M , z ", +" 7 c 5 k j _ n , : I , Y _ _ _ _ _ _ _ _ _ _ t g _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ , h _ _ j p 5 c n ", +" 8 , f , > : f G 0 ] c : _ _ _ _ _ _ _ _ _ y ) ~._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ y F , G f : > , I , ^. ", +" 2 ] o / _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ / ! _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ / o ! n ", +" d , o _ _ _ _ _ _ _ _ _ _ , , , , , _ _ F ^ _ _ _ _ _ _ _ _ _ _ _ _ n , , , q _ _ _ _ _ _ _ _ _ _ o , @ ", +" % n v _ _ _ _ _ _ _ _ _ A Y Y *.e _ : R /._ _ _ _ _ _ _ _ _ _ _ _ n ~.~.~.y _ _ _ _ _ _ _ _ _ v (.V ", +" n H y _ _ _ _ _ _ _ _ ( _ _ j I _ P i _ _ _ _ _ _ _ _ _ _ _ _ _ n {.k [ : _ _ _ _ _ _ _ _ y ) (. ", +" , h _ _ _ _ _ _ _ _ _ _ 6 ) _ _ r [ _ _ _ y B c j ) _ _ _ _ _ Q _ Q , K _ _ _ _ _ _ _ _ p , ~ ", +" 8 , j _ _ _ _ _ _ _ _ _ F o _ : i _._ _ _ F e _ _ / _ _ _ _ _ _ _ : , c _ _ _ _ _ _ _ j , C ", +" C , B _ _ _ _ _ _ _ T e : _ Q H : _ _ _ .) r h v _ _ _ _ _ 6 _ v , ^ _ _ _ _ _ _ B , J ", +" z , h y _ _ _ : _ [ W _ _ [ r _ _ _ _ , ) _ ! i _ _ _ _ _ F D ) < 5 : _ _ _ y h , u ", +" S , u v _ Y > j _ _ _ _ b Q _ _ _ _ n h _ < > _ _ _ _ _ _ _ _ _ j > / _ a ) , C ", +" + n (.o o , p _ _ _ _ _ _ _ _ _ _ p A _ A G _ _ _ _ _ _ _ _ _ k , 4 o (.(.~ ", +" N , ! m 5 _ _ _ _ _ _ _ _ _ _ ( 3 j e P _ _ _ _ _ _ _ _ _ 5 f ! , V ", +" 1 7 , c M _ _ _ _ _ _ _ _ _ _ #.b _ _ _ _ _ _ _ _ _ _ M c , n @ ", +" & 7 , 3 o 5 _ _ _ _ _ _ 6 , , 6 _ _ _ _ _ _ 5 o 3 , n ^. ", +" 8 V , > ! [ Y ( _ _ : < < _ _ _ ( Y [ ! , , &.:. ", +" z V > , , > .) ! ! ) .> , , > V # * ", +" d @ # e N V .N ;.>.,.'. ", +" ", +" "}; diff --git a/pixmaps/master.xpm b/pixmaps/master.xpm deleted file mode 100644 index 8c86b40..0000000 --- a/pixmaps/master.xpm +++ /dev/null @@ -1,184 +0,0 @@ -/* XPM */ -static char * master_xpm[] = { -"64 64 117 2", -" c None", -". c #737584", -"+ c #5A5963", -"@ c #42454A", -"# c #313439", -"$ c #293031", -"% c #212429", -"& c #42414A", -"* c #525963", -"= c #6B6D7B", -"- c #84828C", -"; c #4A4D52", -"> c #000400", -", c #000000", -"' c #212021", -") c #292C29", -"! c #393839", -"~ c #4A4552", -"{ c #5A5D6B", -"] c #393C39", -"^ c #848284", -"/ c #BDBABD", -"( c #DEDFDE", -"_ c #FFFFFF", -": c #FFFBFF", -"< c #525552", -"[ c #7B7D7B", -"} c #52555A", -"| c #94929C", -"1 c #52515A", -"2 c #101010", -"3 c #424142", -"4 c #A5A2A5", -"5 c #F7F3F7", -"6 c #E7E7E7", -"7 c #080C10", -"8 c #4A4952", -"9 c #63656B", -"0 c #5A5D5A", -"a c #D6D7D6", -"b c #B5B2B5", -"c c #5A595A", -"d c #525563", -"e c #292829", -"f c #ADAAAD", -"g c #848684", -"h c #525152", -"i c #313431", -"j c #6B696B", -"k c #4A494A", -"l c #EFEBEF", -"m c #ADA6AD", -"n c #080C08", -"o c #9C9E9C", -"p c #4A4D4A", -"q c #CECBCE", -"r c #737573", -"s c #E7E3E7", -"t c #6B6D6B", -"u c #312C31", -"v c #DEDBDE", -"w c #FFF7FF", -"x c #101410", -"y c #F7F7F7", -"z c #393C42", -"A c #424542", -"B c #636563", -"C c #393842", -"D c #7B797B", -"E c #6B6D73", -"F c #737173", -"G c #212421", -"H c #313031", -"I c #A5A6A5", -"J c #292C31", -"K c #8C8A8C", -"L c #212821", -"M c #D6D3D6", -"N c #212029", -"O c #B5BAB5", -"P c #BDBEBD", -"Q c #C6C7C6", -"R c #293029", -"S c #424952", -"T c #EFEFEF", -"U c #424942", -"V c #181C21", -"W c #949294", -"X c #5A615A", -"Y c #B5B6B5", -"Z c #A5AAA5", -"` c #949694", -" . c #181C18", -".. c #737973", -"+. c #949A94", -"@. c #636163", -"#. c #ADAEAD", -"$. c #292429", -"%. c #4A514A", -"&. c #181818", -"*. c #9C9A9C", -"=. c #525952", -"-. c #9CA29C", -";. c #212829", -">. c #313039", -",. c #39414A", -"'. c #4A515A", -"). c #E7EBE7", -"!. c #636963", -"~. c #CECFCE", -"{. c #8C8E8C", -"]. c #394139", -"^. c #393442", -"/. c #C6CBC6", -"(. c #080808", -"_. c #C6C3C6", -":. c #393C4A", -" ", -" ", -" . + @ # $ % % $ # & * = ", -" - ; % > , , > ' ) ! ! ) ' > , , > % ~ ", -" { % , > ] ^ / ( _ _ : < < _ _ _ ( / [ ] > , ' } ", -" | 1 2 , 3 4 5 _ _ _ _ _ _ 6 , , 6 _ _ _ _ _ _ 5 4 3 , 7 8 ", -" 9 2 , 0 a _ _ _ _ _ _ _ _ _ _ b b _ _ _ _ _ _ _ _ _ _ a c , 7 d ", -" e , ] f 5 _ _ _ _ _ _ _ : g > h _ i j ! k l _ _ _ _ _ _ _ 5 m ] , % ", -" = 7 n 4 o , p _ _ _ _ _ _ _ q q , h _ r _ s , t _ _ _ _ _ _ _ k , o 4 n n ", -" } , u v _ / > t _ _ _ _ _ _ _ _ _ , h _ _ _ 5 , j _ _ _ _ _ _ _ j > / _ v u , 8 ", -" @ , < : _ _ _ w g > h : g > h _ _ _ , h _ _ _ o x v _ _ _ : g > h _ : _ _ _ y < , z ", -" @ , j _ _ _ _ _ q q , h q q , h _ _ _ , h _ _ / A ( _ _ _ _ q q , h _ _ _ _ _ _ _ B , C ", -" } , j _ _ _ _ _ _ _ _ , h _ _ , h _ _ _ , h _ D p q q t _ _ _ _ _ , h _ _ _ _ _ _ _ _ j , 8 ", -" E , < _ _ _ _ _ _ _ _ _ , h _ _ , h _ s F , G [ , , , , h _ _ _ _ _ , h _ _ _ ( _ _ _ _ _ p , + ", -" 7 H : _ _ _ _ _ _ _ _ _ , h _ _ , h _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ , h _ _ [ G I _ _ _ _ y J n E ", -" e n v _ _ _ _ _ _ _ _ _ _ , h _ _ , h _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ , h _ K G L M _ _ _ _ _ v n N ", -" 9 , 4 _ _ _ _ _ _ _ _ _ s F , G r F , G g _ _ _ _ _ _ _ _ _ _ _ _ _ s F , G 0 G G O _ _ _ _ _ _ _ o , 1 ", -" 2 ] o / _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ P G G I _ _ _ _ _ _ _ / o ! 7 ", -" 1 , f , > w g > h _ 6 3 t 3 6 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Q ) G K _ _ i j ! k l : > , f , & ", -" 2 c 5 p t q q , h _ c ] _ ] c _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ v R G r _ _ _ r _ s , t _ j p 5 c 7 ", -" { , a _ _ _ _ _ , h _ x h _ p x _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 6 ] G B _ _ _ _ _ _ 5 , j _ _ _ _ M , S ", -" % 3 _ _ _ _ _ _ , h _ , h _ h , _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ T U G h y _ _ _ _ _ _ o x v _ _ _ _ _ 3 V ", -" , 4 _ _ _ _ _ _ , h _ 2 h _ p x _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ y h G A T _ _ _ _ _ _ / A ( _ _ _ _ _ _ o , ", -" ; > y _ _ _ _ _ _ , h _ < ] _ ] < _ _ _ _ _ _ _ _ _ _ _ _ _ _ < l _ _ B G ] 6 _ _ _ _ _ _ D p q q t _ _ _ _ _ 5 > z ", -" % ] _ _ _ _ _ s F , G g s ] j ] s _ _ _ _ _ _ _ _ _ _ _ _ _ v L 5 _ [ G R v _ _ _ _ _ _ T , , , , h _ _ _ _ _ _ ! V ", -" > ^ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ W X _ K G L Q _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ [ > ", -" . , Y _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ k Z I G G / _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Y , d ", -" { , ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ( G b G G I _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ( , @ ", -" @ > _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ` p L G K _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ > # ", -" # ._ _ _ _ P G < A s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ` p L G G .._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ c F ] i v _ _ _ _ .e ", -" J ) : 6 _ _ G , 5 A h _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +.G G G G A _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ P _ T , @._ _ 6 : ) N ", -" e ! < , b _ > , _ h 2 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ p G j B G U _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ a , ^ _ #., < ! V ", -" $.! < , b _ i , l ! > _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ %.G B B G G 4 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ f &.A : _ #., < ! V ", -" J ) _ 6 _ _ v < j e ._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ *.G G G G G G =.s _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ M , [ _ _ 6 _ ) N ", -" # ._ _ _ _ Q : _ ) t _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ j ) U 3 G G G ) -._ _ _ _ _ _ _ _ _ _ _ _ B _ T , @._ _ _ _ .;. ", -" & > _ _ _ _ ^ h 0 < 5 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 0 ` _ _ Z R G G G < ( _ _ _ _ _ _ _ _ _ _ ] t ] ! v _ _ _ _ > >. ", -" + , ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ T G ( _ _ _ 6 @.G G G ) o _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ( , ,. ", -" = , Y _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Z k _ _ _ _ _ _ #.R G G G < ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ Y , '. ", -" > [ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ X W _ _ _ _ _ _ _ ).B G G G e +._ _ _ _ _ _ _ _ _ _ _ _ _ _ [ > ", -" % ] _ _ _ _ _ _ Y ) c ! B _ _ _ _ _ _ _ _ _ _ _ _ 5 L v _ _ _ _ _ _ _ _ _ #.H G G G G s _ _ f , h _ _ _ _ _ _ _ ! V ", -" 8 > 5 _ _ _ _ _ 2 , : 4 , Y _ _ _ _ _ _ _ _ _ _ _ #.A _ _ _ _ _ _ _ _ _ _ _ l !.G G G F _ s h , h _ _ _ _ _ _ 5 > # ", -" , 4 _ _ _ _ _ i , T *., ~._ _ _ _ _ _ _ _ _ _ _ B {._ _ _ _ _ _ _ _ _ _ _ _ _ b i G *._ h s , h _ _ _ _ _ _ o , * ", -" ' 3 _ _ _ _ _ ( ' A ' D _ _ _ _ _ _ _ _ _ _ _ y e M _ _ _ _ _ _ _ _ _ _ _ _ _ _ : 6 _ K I _ , h _ _ _ _ _ _ 3 &. ", -" } , M _ _ _ _ H , 5 o , M _ _ _ _ _ _ _ _ _ _ Y ]._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ] B B , ' K _ _ _ _ M , z ", -" 7 c 5 k j _ n , : I , Y _ _ _ _ _ _ _ _ _ _ t g _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ , h _ _ j p 5 c n ", -" 8 , f , > : f G 0 ] c : _ _ _ _ _ _ _ _ _ y ) ~._ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ y F , G f : > , I , ^. ", -" 2 ] o / _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ / ! _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ / o ! n ", -" d , o _ _ _ _ _ _ _ _ _ _ , , , , , _ _ F ^ _ _ _ _ _ _ _ _ _ _ _ _ n , , , q _ _ _ _ _ _ _ _ _ _ o , @ ", -" % n v _ _ _ _ _ _ _ _ _ A Y Y *.e _ : R /._ _ _ _ _ _ _ _ _ _ _ _ n ~.~.~.y _ _ _ _ _ _ _ _ _ v (.V ", -" n H y _ _ _ _ _ _ _ _ ( _ _ j I _ P i _ _ _ _ _ _ _ _ _ _ _ _ _ n {.k [ : _ _ _ _ _ _ _ _ y ) (. ", -" , h _ _ _ _ _ _ _ _ _ _ 6 ) _ _ r [ _ _ _ y B c j ) _ _ _ _ _ Q _ Q , K _ _ _ _ _ _ _ _ p , ~ ", -" 8 , j _ _ _ _ _ _ _ _ _ F o _ : i _._ _ _ F e _ _ / _ _ _ _ _ _ _ : , c _ _ _ _ _ _ _ j , C ", -" C , B _ _ _ _ _ _ _ T e : _ Q H : _ _ _ .) r h v _ _ _ _ _ 6 _ v , ^ _ _ _ _ _ _ B , J ", -" z , h y _ _ _ : _ [ W _ _ [ r _ _ _ _ , ) _ ! i _ _ _ _ _ F D ) < 5 : _ _ _ y h , u ", -" S , u v _ Y > j _ _ _ _ b Q _ _ _ _ n h _ < > _ _ _ _ _ _ _ _ _ j > / _ a ) , C ", -" + n (.o o , p _ _ _ _ _ _ _ _ _ _ p A _ A G _ _ _ _ _ _ _ _ _ k , 4 o (.(.~ ", -" N , ! m 5 _ _ _ _ _ _ _ _ _ _ ( 3 j e P _ _ _ _ _ _ _ _ _ 5 f ! , V ", -" 1 7 , c M _ _ _ _ _ _ _ _ _ _ #.b _ _ _ _ _ _ _ _ _ _ M c , n @ ", -" & 7 , 3 o 5 _ _ _ _ _ _ 6 , , 6 _ _ _ _ _ _ 5 o 3 , n ^. ", -" 8 V , > ! [ Y ( _ _ : < < _ _ _ ( Y [ ! , , &.:. ", -" z V > , , > .) ! ! ) .> , , > V # * ", -" d @ # e N V .N ;.>.,.'. ", -" ", -" "}; diff --git a/src/clock.c b/src/clock.c index 798d152..3bd54aa 100644 --- a/src/clock.c +++ b/src/clock.c @@ -48,6 +48,8 @@ #include "clock.h" #include "hvclock.h" #include "dockapp.h" +#include "clock-mask.xpm" +#include "calendar-mask.xpm" /* Constants */ #define CLOCK_MODE 0 @@ -385,9 +387,11 @@ hvclock_expose(GtkWidget *clock, GdkEventExpose *event) cairo_clip(cr); if (hvclock_mode == CLOCK_MODE) { + dockapp_set_mask(clock, clock_mask_xpm); draw_clock_background(clock, cr); draw_clock_hands(clock, cr); } else { + dockapp_set_mask(clock, calendar_mask_xpm); draw_calendar(clock, cr); } diff --git a/src/dockapp.c b/src/dockapp.c index 6fa197c..d7e268e 100644 --- a/src/dockapp.c +++ b/src/dockapp.c @@ -41,7 +41,6 @@ #include "clock.h" #include "hvclock.h" #include "dockapp.h" -#include "master.xpm" #define GTK_WITHDRAWN_HACK 1 @@ -98,8 +97,8 @@ dockapp_gtk_withdrawn_hack(GtkWidget *dockwin, GtkWidget *iconwin) XDestroyWindow(d, win_temp); } -static void -dockapp_set_mask(GtkWidget *dockwin, GtkWidget *iconwin, char **xpm) +void +dockapp_set_mask(GtkWidget *iconwin, char **xpm) { GdkPixbuf *pixbuf; GdkPixmap *pixmap; @@ -116,7 +115,6 @@ dockapp_set_mask(GtkWidget *dockwin, GtkWidget *iconwin, char **xpm) exit(1); } - gtk_widget_shape_combine_mask(dockwin, mask, 0, 0); gtk_widget_shape_combine_mask(iconwin, mask, 0, 0); } @@ -150,8 +148,6 @@ dockapp_init(int argc, char *argv[], char *display_arg, char *geometry_arg) gtk_widget_realize(iconwin); gdk_window_set_icon(dockwin->window, iconwin->window, NULL, NULL); - dockapp_set_mask(dockwin, iconwin, master_xpm); - hvclock_init(dockwin, iconwin); gtk_widget_show(iconwin); diff --git a/src/dockapp.h b/src/dockapp.h index be19f47..5ae2ac5 100644 --- a/src/dockapp.h +++ b/src/dockapp.h @@ -21,9 +21,13 @@ #ifndef DOCKAPP_H #define DOCKAPP_H 1 +#include #include void dockapp_init(int argc, char *argv[], char *display_arg, char *geometry_arg); +void +dockapp_set_mask(GtkWidget *iconwin, char **xpm); + #endif /* DOCKAPP_H */