From 8bbb1066d3d3d890bd9a8cc9a9356cc2b8efdd73 Mon Sep 17 00:00:00 2001 From: Eric Wertz Date: Mon, 5 Dec 2016 09:29:03 -0500 Subject: [PATCH] Broke apart files, should actually compile now --- .main.c.swp | Bin 12288 -> 0 bytes Makefile | 13 +++++-- clock.c | 4 ++- clock.h | 6 ---- dock_icon.c | 4 +-- dock_icon.h | 4 +-- drawing.c | 17 +++++++++ drawing.h | 16 +-------- eric_window.h | 4 --- ericdock.h | 4 +++ ericwindow-test | Bin 16144 -> 16544 bytes pager_item.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ pager_item.h | 86 ++++---------------------------------------- tooltip_window.c | 3 +- tooltip_window.h | 4 --- 15 files changed, 136 insertions(+), 120 deletions(-) delete mode 100644 .main.c.swp create mode 100644 drawing.c create mode 100644 pager_item.c diff --git a/.main.c.swp b/.main.c.swp deleted file mode 100644 index a4c15ba84b9b4e9e835327274f9f6018d00d2c8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&u<$=6vwBWfKn*sj$YgrIj$4iAreH110i-@%Z?KzPVN3cqm6fLuk7qvyKBc* zY0HH><;Dp(AZ}a`Cj=MHaA~-}AAr;|7lefP&dl0zQl%hng<0hr@6NvWX5Qz$8MTV{ z($|X{^v3)m!*!mqKd*Oczn;Cs!V8QE-)YFF!mkvE%Z6`0dya_1Rb7b>__Ma z=p*O>G=eN>33?ei4}J1HV;@5|p`Vf4A@mUX9{L(m`96j9GD|iD3;{#H5HJJ`f&V3e zyNq!8BJBGvrI*!HE9`LjMauZ>GX8CbOB>0%p6|F}GfuI~!R6q#8%xrG+vxBE$F;o! z-Vz~qt$h(EJwUV3`$pFa0^ahyes9|7gzJ>mQ3RSLEJMyMuNquxYO=(5jx5zG>m^<* zR&txQu^;a`K{&T+TcI^}zr$pJrsp5Cp{&jzX!t_7YH@n)L7em${G+K08 zC7K+No~uuyMhlh87>CG4U=kIGEM z#mVlClH??5!?PDRte}&mA(Bs0)$fZWNi)0=Yr)8EoOm3ULZ)$gJbF)tUif#Rr>g9r zwwd%YIkb|c1$lGj3W_2pPo?BC$?fm&37X9hxoGyjNtj3Po zGv@@ot~E+XKJYE%N<3HG*($Hy;PvPxPO=uZHdMVfsqKWg+?o7TUM-fZ`E9opo(Bl%TYb9W>$i^E==NCIrtm_sec != oldsec ); + { gtk_widget_queue_draw( GTK_WIDGET( data ) ); + } return TRUE; } diff --git a/clock.h b/clock.h index 3a2bd0d..221c327 100644 --- a/clock.h +++ b/clock.h @@ -6,12 +6,6 @@ #include "eric_window.h" -extern double clock_alpha; -extern double clock_height; -extern int displaymode; -extern char* weekday_names[7]; -extern char* month_names[12]; - gboolean clock_refresh(gpointer data); void clock_init( gpointer window ); void clock_draw_timestring(cairo_t* cr, double x, double y, int blurpass); diff --git a/dock_icon.c b/dock_icon.c index c48f4d0..7099e84 100644 --- a/dock_icon.c +++ b/dock_icon.c @@ -4,12 +4,10 @@ * * renders/handles events based on how many pager_items it contains */ +#include "ericdock.h" #include "dock_icon.h" #include "tooltip_window.h" -eric_window* tooltip_window = NULL; -dock_icon* tooltip_window_icon = NULL; - dock_icon* dock_icon_create( WnckClassGroup* class_group ) { dock_icon* icon = malloc( sizeof( dock_icon ) ); diff --git a/dock_icon.h b/dock_icon.h index a97c4b4..d0a9fc9 100644 --- a/dock_icon.h +++ b/dock_icon.h @@ -7,13 +7,11 @@ */ #include #include +#include #define WNCK_I_KNOW_THIS_IS_UNSTABLE #include -#include - -#include "ericdock.h" #include "pager_item.h" typedef struct diff --git a/drawing.c b/drawing.c new file mode 100644 index 0000000..beedc96 --- /dev/null +++ b/drawing.c @@ -0,0 +1,17 @@ +#include "drawing.h" +#include + +void draw_rounded_rect(cairo_t* cr,double x,double y,double w,double h,double r) +{ + cairo_move_to(cr,x+r,y); + cairo_line_to(cr,x+w-r*2,y); + cairo_arc(cr,x+w-r,y+r,r,-M_PI/2.0,0); + cairo_line_to(cr,x+w,y+h-r*2); + cairo_arc(cr,x+w-r,y+h-r,r,0,M_PI/2.0); + cairo_line_to(cr, x+r,y+h); + cairo_arc(cr,x+r,y+h-r,r,M_PI/2.0,M_PI); + cairo_line_to(cr, x, y+r); + cairo_arc(cr,x+r,y+r,r,M_PI,-M_PI/2.0); + cairo_close_path(cr); +} + diff --git a/drawing.h b/drawing.h index ced8af9..55dfffc 100644 --- a/drawing.h +++ b/drawing.h @@ -3,19 +3,5 @@ * Drawing functions! */ #include -#include - -void draw_rounded_rect(cairo_t* cr,double x,double y,double w,double h,double r) -{ - cairo_move_to(cr,x+r,y); - cairo_line_to(cr,x+w-r*2,y); - cairo_arc(cr,x+w-r,y+r,r,-M_PI/2.0,0); - cairo_line_to(cr,x+w,y+h-r*2); - cairo_arc(cr,x+w-r,y+h-r,r,0,M_PI/2.0); - cairo_line_to(cr, x+r,y+h); - cairo_arc(cr,x+r,y+h-r,r,M_PI/2.0,M_PI); - cairo_line_to(cr, x, y+r); - cairo_arc(cr,x+r,y+r,r,M_PI,-M_PI/2.0); - cairo_close_path(cr); -} +void draw_rounded_rect(cairo_t* cr,double x,double y,double w,double h,double r); diff --git a/eric_window.h b/eric_window.h index 8cb667a..47e9e64 100644 --- a/eric_window.h +++ b/eric_window.h @@ -11,10 +11,6 @@ #include #include -/* - * TODO: add text color - */ - typedef struct eric_window eric_window; struct eric_window { diff --git a/ericdock.h b/ericdock.h index 0a7f87a..08bf440 100644 --- a/ericdock.h +++ b/ericdock.h @@ -4,6 +4,7 @@ */ #include "eric_window.h" +#include "dock_icon.h" #define ERIC_DOCK_FONT "Source Sans Pro Regular" #define ERIC_DOCK_TOOLTIP_SHADOW_RADIUS 16.0 @@ -20,3 +21,6 @@ extern GList* dock_icons; extern eric_window* dock_window; +extern eric_window* tooltip_window; +extern dock_icon* tooltip_window_icon; + diff --git a/ericwindow-test b/ericwindow-test index 0d67b54b7ba0d541c1edb74c085ebba129f0638a..76efba7c21615d8277f874c7f577db7ab22e872f 100755 GIT binary patch delta 4789 zcmaJ_4Nz3q6~6B+u>2U=eI0e(a=y^bfroWQ$>YJ%;>I# zq**DQt+$gnnQ3P0OdV=7QzDrTGE+ct1d}v{wsA}*PSL6Ddzz-Gh}5dvbI$J58_e|1 z>^<-M&bjCQy!+kv-Ubc^4@rSsd9wWH`NvDQW-uzcWz0!ff;t9%O%Z=nhKKm33@%IA zNxlf}i_pFdzD(Mb5wuef3)cbhHVc)=SKya@u|Bk=PCzE|L%5cqz9pD*yk0-qS>y=2A&he>EK zF7Rf7zbNoY0zWD6$pWtme2TzNWqCaWjZmiwj#;5Wn!vNjX25uhz{d)_Rp3nmZxeW{ z&g1+S2o9(20B)hc=L-BHfiD*Lh-%1NF7OT^-YxJ>;KS<=7mDDBsFIr12z(|n;i^vH zpA>kHz-I}3lfb(k@m|&B0*M?i8)$5>TrQ>YuNH{3;Of$Gbu9u-sbhzOPaT7YV z$q*D*17bWXwQ<555#xcN4HI6E*nqf~@LI%pBxpgx&jI!}MI#X)Vi^X+AodY1MU3;* zS_tPO#&bdQ5Y9v#hq#7tI$}H-G&kWS#CRfT#f0M#<4K@73Cl@NFKfahKr<0>*9-wD zeT@;mi5MlXO+5g@bqz5pU7I9)1u-gI8z=l3VpO&^O!&`;lM(k4{s1v5Sqla?3e{=|zl}H@v77J_#3)p)nDAl5C{WEw z_{Ux(P??&Ei2aCBks2es2Qey9o4SuH(2UrLc#?1fVicY>PIx0?6r46pcs*hin$}Br zEn*ay79{L_4hdA279e67;%vk|!lj5&Fj@=Ye8jnkJ%lq6qj0nu!s&=nFq)fi5@LLY zX~l%&5ue)fa;7$LQw+VPP|39G+P4WB)j!EhG!l|ZV zAT;ThR4p}@l-n+CivmqFY~Lq0fT)YJE95Uj>S!*bR1Aw+gs`bXiE{W9m zT45U=fE!W{_7d1Su&ZIGw}ZV3_9)nBxO4qrSAe|;HWrSTS+Lz;t?*Qgfki9_I|u&Nh_G~GQYj%hH@eGf5*rgRb&*6{{+~I2-c6sy;Zw9WK z`yCE%^<78^17ub6O|Q!|3cdCfzwe=c zEBJp1{#U-@ZzX>gaGes%XXhZ`q8L!!VURx#4+7~`@Ou{$weuT}m2uN>6@;~s`Gl0* zSL1X_rPFYxV$okQ_0KH*%@SvW1s`ZwS~B>tjDvD{7SGIlV1TbLNR`@G{-o0&P4nH^ zsRk2c{8wPjEQr>d#B$-Zom&hn8J=05ximAd6zJmX_*B;ZwR{@WKLN#L26)FV&VoFA zTaMXaW#xQJPU=D%>xYwmZZW{*;N)+}*(A4T@H07^((wU+1(u7-M!Lq4@nyM%GJJwI z=N?b@WVplbNNt613BCm&Nq$~oLlD#>mNIfbK3q5TlKj}TUx@H?mkIZU#9&HUd?4>a zsXkV{t425=op3wn&eRV3-3*_l%+Al`zn(b{!jjm0h7VILw28n5F-*3xVHa;+yff}y zcr{D{ZBFyci`$atvz`TRjApcH!M5S2uyl~>W`5`?3vY_DN+%H8zDI2nSg+ZQP1rW7 z89PhfPvNZ;JDNNGtLTlM2Cox$sT9j6WQ)xl8SbTYH)SDF!PNrvN<~=nU_liBtDIun z3bCfIS%KXY>*o^%4)ge&eefId{ekKUtZo0GEVwf~)T3VAL~ltH&22uzR}w7x+)^TZ zL1bA;yx`B{rwc8%XUPjQOL1ePhvl2-mA*rD1HVydDLEL)^G}PLqTY$b9*gk!MuY|K z7L}9K_5-Rl%plF;b#!V>WF7frkyTp9FBe%PPv7OD{RZ>iZLMuBo44-z{*KN2w(s1! zYaieE^e^LnuxCrd<{jH!*~@31zMB$`Y2CH!<<{*jk+8mhFA2(hfijOlE{)?imlek8 zXUH_qt0?2a3KMUsC^qZ+U;j&{lfPF{l%yX9xsLF_m&^QSMPawvjAPlexuUyKV%Q^r2qf` delta 4379 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 R)xKp3laWt?TG8h7{13RKURVGC diff --git a/pager_item.c b/pager_item.c new file mode 100644 index 0000000..5cd5866 --- /dev/null +++ b/pager_item.c @@ -0,0 +1,91 @@ +/* + * pager_item - held by the dock_icon object + */ + +#include "pager_item.h" + +#include +#include +#include + +#include "ericdock.h" +#include "drawing.h" + +void pager_item_name_changed( WnckWindow* window, pager_item* item ) +{ + strcpy( item->name, wnck_window_get_name( window ) ); +} + +void pager_item_icon_changed( WnckWindow* window, pager_item* item ) +{ + item->icon_pixbuf = wnck_window_get_mini_icon( window ); +} + +void pager_item_state_changed( WnckWindow* window, WnckWindowState changed_mask, WnckWindowState new_state, pager_item* item ) +{ + //item->icon_pixbuf = wnck_window_get_mini_icon( window ); +} + +pager_item* pager_item_create( WnckWindow* window ) +{ + pager_item* item = malloc( sizeof( pager_item ) ); + item->window = window; + strcpy( item->name, wnck_window_get_name( item->window ) ); + item->icon_pixbuf = wnck_window_get_mini_icon( item->window ); + item->icon_state = ICON_STATE_NORMAL; + + g_signal_connect( G_OBJECT( window ), "name-changed", G_CALLBACK( pager_item_name_changed ), (gpointer)item ); + g_signal_connect( G_OBJECT( window ), "icon-changed", G_CALLBACK( pager_item_icon_changed ), (gpointer)item ); + g_signal_connect( G_OBJECT( window ), "state-changed", G_CALLBACK( pager_item_state_changed ), (gpointer)item ); + + item->width = SCALE_VALUE( 320 ); + item->height = SCALE_VALUE( 24.0 ); + item->text_height = SCALE_VALUE( 16.0 ); + + return item; +} + +/* Returns bool if state has changed */ +int pager_item_mouse_move( pager_item* item, double mx, double my ) +{ + double it, ib, il, ir; + int old_state; + + old_state = item->icon_state; + + il = item->x; ir = item->x + item->width; + it = item->y; ib = item->y + item->height; + + if( il < mx && mx < ir && it < my && my < ib ) + { + item->icon_state = ICON_STATE_HOVER; + } + else + { + item->icon_state = ICON_STATE_NORMAL; + } + + return old_state != item->icon_state; +} + +void pager_item_draw( pager_item* item, cairo_t* cr, eric_window* w, cairo_pattern_t* pattern ) +{ + if( item->icon_state == ICON_STATE_HOVER ) + { + w->text_color.alpha = 0.25; + gdk_cairo_set_source_rgba( cr, &w->text_color ); + draw_rounded_rect( cr, item->x, item->y, + item->width, item->height, SCALE_VALUE( 2.0 ) ); + cairo_fill( cr ); + } + + gdk_cairo_set_source_pixbuf( cr, item->icon_pixbuf, item->x, item->y + SCALE_VALUE( 6.0 ) ); + cairo_paint( cr ); + + cairo_set_source( cr, pattern ); + cairo_move_to( cr, item->x + SCALE_VALUE( 20.0 ), item->y + item->text_height ); + cairo_text_path( cr, item->name ); + + cairo_fill( cr ); + +} diff --git a/pager_item.h b/pager_item.h index ebee6ad..dba3115 100644 --- a/pager_item.h +++ b/pager_item.h @@ -3,8 +3,6 @@ * pager_item - held by the dock_icon object */ -#include -#include #include #define WNCK_I_KNOW_THIS_IS_UNSTABLE @@ -25,81 +23,9 @@ typedef struct int icon_state; } pager_item; -void pager_item_name_changed( WnckWindow* window, pager_item* item ) -{ - strcpy( item->name, wnck_window_get_name( window ) ); -} - -void pager_item_icon_changed( WnckWindow* window, pager_item* item ) -{ - item->icon_pixbuf = wnck_window_get_mini_icon( window ); -} - -void pager_item_state_changed( WnckWindow* window, WnckWindowState changed_mask, WnckWindowState new_state, pager_item* item ) -{ - //item->icon_pixbuf = wnck_window_get_mini_icon( window ); -} - -pager_item* pager_item_create( WnckWindow* window ) -{ - pager_item* item = malloc( sizeof( pager_item ) ); - item->window = window; - strcpy( item->name, wnck_window_get_name( item->window ) ); - item->icon_pixbuf = wnck_window_get_mini_icon( item->window ); - item->icon_state = ICON_STATE_NORMAL; - - g_signal_connect( G_OBJECT( window ), "name-changed", G_CALLBACK( pager_item_name_changed ), (gpointer)item ); - g_signal_connect( G_OBJECT( window ), "icon-changed", G_CALLBACK( pager_item_icon_changed ), (gpointer)item ); - g_signal_connect( G_OBJECT( window ), "state-changed", G_CALLBACK( pager_item_state_changed ), (gpointer)item ); - - item->width = SCALE_VALUE( 320 ); - item->height = SCALE_VALUE( 24.0 ); - item->text_height = SCALE_VALUE( 16.0 ); - - return item; -} - -/* Returns bool if state has changed */ -int pager_item_mouse_move( pager_item* item, double mx, double my ) -{ - double it, ib, il, ir; - int old_state; - - old_state = item->icon_state; - - il = item->x; ir = item->x + item->width; - it = item->y; ib = item->y + item->height; - - if( il < mx && mx < ir && it < my && my < ib ) - { - item->icon_state = ICON_STATE_HOVER; - } - else - { - item->icon_state = ICON_STATE_NORMAL; - } - - return old_state != item->icon_state; -} - -void pager_item_draw( pager_item* item, cairo_t* cr, eric_window* w, cairo_pattern_t* pattern ) -{ - if( item->icon_state == ICON_STATE_HOVER ) - { - w->text_color.alpha = 0.25; - gdk_cairo_set_source_rgba( cr, &w->text_color ); - draw_rounded_rect( cr, item->x, item->y, - item->width, item->height, SCALE_VALUE( 2.0 ) ); - cairo_fill( cr ); - } - - gdk_cairo_set_source_pixbuf( cr, item->icon_pixbuf, item->x, item->y + SCALE_VALUE( 6.0 ) ); - cairo_paint( cr ); - - cairo_set_source( cr, pattern ); - cairo_move_to( cr, item->x + SCALE_VALUE( 20.0 ), item->y + item->text_height ); - cairo_text_path( cr, item->name ); - - cairo_fill( cr ); - -} +void pager_item_name_changed( WnckWindow* window, pager_item* item ); +void pager_item_icon_changed( WnckWindow* window, pager_item* item ); +void pager_item_state_changed( WnckWindow* window, WnckWindowState changed_mask, WnckWindowState new_state, pager_item* item ); +pager_item* pager_item_create( WnckWindow* window ); +int pager_item_mouse_move( pager_item* item, double mx, double my ); +void pager_item_draw( pager_item* item, cairo_t* cr, eric_window* w, cairo_pattern_t* pattern ); diff --git a/tooltip_window.c b/tooltip_window.c index 0fcad92..c89acd7 100644 --- a/tooltip_window.c +++ b/tooltip_window.c @@ -1,10 +1,9 @@ -#include "tooltip_window.h" #include "ericdock.h" #define WNCK_I_KNOW_THIS_IS_UNSTABLE #include -#include "dock_icon.h" +#include "tooltip_window.h" #include "drawing.h" eric_window* tooltip_window = NULL; diff --git a/tooltip_window.h b/tooltip_window.h index b4bd52f..edf40cb 100644 --- a/tooltip_window.h +++ b/tooltip_window.h @@ -2,10 +2,6 @@ #include #include "eric_window.h" -#include "dock_icon.h" - -extern eric_window* tooltip_window; -extern dock_icon* tooltip_window_icon; void tooltip_window_hide(); gboolean tooltip_window_lose_focus( GtkWidget* widget, GdkEvent* event, gpointer user ); -- 2.47.0