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 zcmYc?2=nw+FxN9-U|?VnU|{$cmL2|_TZN%Sh=C!sC^H!(ObCP2rKA>Tm*f}VRays9 zsP9^ond~2|4`Qd}Cui&DCT8a85oHfv!$&1YLtr!naECx?Nt&(&FN3j>p#eydvXY{L zuuv$7If_R^U^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qNC=b^Ff!CLFfcGd{c8!O8PRAc zca$0pfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Ez0XkeI^2u$hB_VKXOW z{vX!=f5p$haD|_N;W9r1!#aKjhKc+P3={Yn7|Qt>7|Qq=7!>#!807dF7=H6HFx=*2 zV7SW1z_6T;fngyZ1H%G728ISc28KF528LQb28Jj;28IYe1_oa~1_mEK1_nJo1_oU| z28J)Z3=F$@85q)e85q)d85kUR85rz&85n-@Ffi=nVPM$H!@#hVhk>D$hk>D=VD-($;H4B z#l^sIi<5!j3MT`@Wljc$!<-BZTREZr9fI*S>g3T77!85Z5Eu=C(GVC7fe{%3wG0Xh z3JOK3C8b4q3I^6-UV2G(JZK@MhNd+GSOB63q_ChUGp{5~LqSQkShYANPf16iJTEyr zzC1H8CBHmAJ+&l0FEKY&LjfY7pb3>v&PgmTj!!SjFD*b;gr*fq6~Y7sO$AMevq1KT z=Ot%{gDum7*b5sy;ws5BBr2e4YdkvsDh%cf?ueQ52~OovJzdpywr*k1x-lcfddF)RD4=~ zQF3a0X+cV2Nh*^0V3$FZU~x}MYFc7xP6;SBKtbT{lUZB>^F7!}kl+CYO)%IOT2Plm zV=p}g9zlsIDe-BUIVGt@8emW8C}bq&rR1c>R~Q<`r zm!;w{%0NfK(7?n1rV+IK8d?TuDU>VNDj*5OCl{rHQ@f$1k%5kaiGhxSk`hQG+_#x| znI#$uYKcYZ$vR-F3@)9SSE7(<%}~t%Vt|Vz1rQ6OG&v)&NJ}BHD7`E?7L?f_X%$+O zfr8)7(P?TC+tN_jliZOX$cY;(x zQdMS}hC)SZnXVluv=wY^6}(d`1Hc*}sVc%1l!LTDY7}f0G@x9~3b1h?U%01ayMc3G z5Tv|C&wLsR?kU+2Z347C?Uz%d<3l_=gX2Ae<3s&|LmZua fT#=24Ff`PU$jM9s>xEfqlb({TpPrIk0TKlOay>I{ diff --git a/Makefile b/Makefile index 049e73e..4092528 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,11 @@ -ericdock: main.c - gcc -o ericdock -lm -lX11 `pkg-config --cflags --libs gtk+-3.0 libwnck-3.0` main.c +CC = gcc +CFLAGS = -std=gnu++98 -Wall -lm -lX11 `pkg-config --cflags gtk+-3.0 libwnck-3.0` +LDFLAGS = `pkg-config --libs gtk+-3.0 libwnck-3.0` +DEPS = dock_icon.h ericdock.h clock.h drawing.h eric_window.h pager_item.h tooltip_window.h +OBJ = dock_icon.o tooltip_window.o eric_window.o clock.o main.o pager_item.o drawing.o + +%.o: %.c $(DEPS) + $(CC) $(CFLAGS) -c -o $@ $< + +ericdock: $(OBJ) + gcc $(LDFLAGS) $(CFLAGS) -o $@ $^ diff --git a/clock.c b/clock.c index 40a8256..33e61e9 100644 --- a/clock.c +++ b/clock.c @@ -9,7 +9,7 @@ #include "clock.h" double clock_alpha = 0.75; -double clock_height = 0.18; +double clock_height = 18.0; int displaymode=0; @@ -49,7 +49,9 @@ gboolean clock_refresh(gpointer data) timeinfo = localtime ( &rawtime ); if( timeinfo->tm_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 zcmbPGx1f=6f(FwAi-}sxj8YUCzyL-wFerfej0_A6Yzzzx8BqBQ#RRZ;hT>!UfkHh;|%st~6^?O^!K!oVQFAjNP2P5ja1Om=yu6RMND*!38{Y~INp$2>Wf zJ9x4@w;g*)c6?@DX36A2L&?o2xMwh`8mK@F1%-h&%wz@zh5)EII|Bm)6AjAVCabbuMn0$dGE&>*T5Fb?PA@Ku>2T_O^nEZjHK@2PcC7_7`q+T2<1fn>Q z#3euiP%MBXE(sL_Q4%n5kpHDYB2cUVlVD(Akb#PUC=DcWS&#q}8z6~8a}8L=0!dsR zECL}Mki|fh4XE6$4QlR4308l&vonQeg0CJy62>;x!WkgGcibj>8~X28REpSwad7 z|5bB@6d3sB9T@(rg7_IA$(IlQ|NsAAHAzT;Ap=xYzPteDM}hdD0^#KWFh2;yXJ%kv zc)0=0_X6=jMZ(JkV7`-(0z-WUD@efvuz(dv0jN}X*#PDnf%qVQzAOOqwLpAOx$rUp z%vS>OIYIgZz9>`Azj80Z`6-DF7Cz z0`WmP@+AY9Uj*WVa^lMme?cLT1>%Ep;L8VKeiDce%6Km?fca4%J}ASzJOJhgf%u?| z_HqN5?*-z6GT6%nV1B(5NC1?xUQPfDSb_MUjPtSq%r^q@K^f*{0hq4^;%k6>m;mN0 zf%u?|^D+R;mjdxY8Rn$}m@fq4gX*xC24FrHh!4s)FBL%idetg^1%|W*xRfU@x9L404l4^BaX1VjzW`$6xgQ{Quvh)AfT#HwaI7!N9-(Vs{JM=|&=^v0%kLEWVS&WW5K?RHB4iM?ld2v?&NPDN~ z@fZ8P|NrmNd_(|A$K-F)a`nAX@n+XQjLo%wMCzvO0>#3bzBdcdRC^$gUb<=>%^`{L?9 z7z`x?LZD{59_z*k54wrf>CN$rrDaUbutA!ESj0_A)s5f&zJ?Qf8CU;rnw7t=r%ce}pu=yu=$B^r*TUxJEwgU|o}UtnNhQ26%${{jXE2C?t||NmfMV0ica|9=Ta z28P-n|NmPsGBDiz@&A7WBLjo`&;S1`7#SFz{`~)c1|tIl>!1JsLCMwj&;S277#SEi z{{H{}gOP!u_wWDz5=;yXZ2$iMw_svm0M#4`ObiU5Dr*H3!{lr^Ri=uslPAgPF-3fu zd`M1>QEc){IeDgY-zIa(%Q4zc)|8iLs{KCMOJ0uY`1i?K@^Xx>lRM?*>s^2S|8D_G zjgEW*ZA{L*Y{fk6pvn@n^|NjQE0@r3{rgLC5AW;Sv1_p*Tj0_AFlRwHkbADlD zU|8_y|9_^*7a4^&2Ph~o8hw$4bd*397)S@KnD`g7bt}?g55b;OH(fi*7XD#0K(>s3=E76n9g+o+aiqN?LeqFdN6^~1tWt5 zgN4fEU7FX7U~UCj0m5l4pdK`)Pvw{x7z7yv7#QRxAJS@5;$dN65MtnC09B?SZQw-2 zz`(Eoq>M?D;ehJoEbTnbHLM_I{0v_vKh!Q2=3`hP4e>KL(K0YFl!Cg#jCEi#YjUHG z_~Z;03C2|*zGMtoFE_&mL5QAIkUb0x3`fASH<=k21eqim(B1zOB+L4RnSnt8lu8*n zCSPO{mlT9L_pTJgEO4e`U|^62$ujDL$jJ+ISteg$5|K;+cfT=1pb(^rv2*f8U3o$D zuK7x^++Hww5kyKp1DgU$8IXP+)bR|TK(dA`V88J(fSM#A8JOQhpyIkR5O;zzF9QRE z=H!EV;*$1YSq26L5r`~ECkXq3WEmsDWYXl1dg6w4V3m9f&&44s=YfpcY~UxG|v`~hOKin2k&aqB+ z&WT zXb0RvWpb9S85b5&W@7-)aYekV2GH! U(axMR!Vna)3=GwiKibIy0AvsFr2qf` delta 4379 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 +#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.49.0