From 605b5ade22121b36162aa24bd6a2a04cc719a1ce Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Sun, 11 Feb 2024 16:22:14 +0100 Subject: [PATCH] simplify bar struct slightly. --- rose | Bin 43200 -> 42856 bytes rose.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rose b/rose index 08caba5aeefc0851e959bbb9a7c94c0be5aee77b..4e509d0e51259956907646d02277f40724fa249e 100755 GIT binary patch delta 11173 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 L$2;t;%{~4PPx9d& delta 12272 zcmai43tUvy)<0*M(cw9af&(20;f!Bt<0!!4wk(Ma9yh1_ab`9D{as zt80a&X0Lluy5BV`!|+wt%uM?%wKPo+VZQQpOP%k(_Bn&&WWVq5JNxlpYp=c5+G{_~ zu%!d4=C4(CVVw%i0)JBEOc2)B_ub?t^irz5>c5Zo3mqWWLIl+nnqe5+DZ;M}b%9|te-p$!+)%2LZ5>=>?*$bJkPeDk& z&&%Je?5ll1((60Fx2jEe;dP&>timU5SPyVb$E(Jx#T%1bpSCtT?(DW$AhU!9Q5&<| zY812{Q{mu+dI)t%q)e{7`B_g|iV?fAN1z8Y|? z-}J+kwF@9k8uF_d#i5whof#+uSkC8#fm*e%j3Q_ zta^5y?UjnE=rh`(%RX5A@(T-I{BB`x#QX`9Kihu#xr$?R@;;7F@fr30*wf7eA3gSK zZ2EVv=!1f1r|(YIk4*PFa=zP)Cog>eYWQ!gP94D-)rsOsc1k^(t}OyN8moAj)psz6g-q;_Aa(+mLHvlPAA`>ze#gt-fG2_N^9zHVo!~pfE~DPtKTJGF zbe7#QOf+)-=U7$81aTwVg7hLg)zN_dC>_SB`&pGUjBP<5{Rw4d&?grXp$SUBAnPDX ziwJwpH&HC+%`9Ar5-w;rXRq@OV~Kd1eZ#~pTvT0$Fs6lq7dUSZ;u2$EWP&)6Rr!q; z6S{jr9_{sc@ z56i%t3f@)0>+)oPVw|2C3Vtw4u7}B)a0<9y=sH!%sgn_!QuNH!$Q@i#8f;U^_}7X; zClw7T_~}_L3lg%uJ5%OgO%J650 zVn(4?@2|M|$H{zO(VB(lU3An*5ZF1j-nL2MNwmncYl^9QMP{NRv!_fJW_6T3Q1*}v zNQ%s>ik!mHGM=q?CY5_2T!`@Uz+_oIR)#5ZgZF*pJQ;$5;gmQp;~xjEhf|DRg2pQR ztGxL4DGD`CmE|g-BB&L^8Z!t-|7l9chq$KjOQGDrJ?2aiL*kvRqF zS(eny^fWf_g|4hQd|l@W>6SE0YDQ*8&Li!#XmYkUMz5ZOPwb+hpj)&Ac<0UT<&fbqOgkwUsKhm>u5n_e;>_mjYtVrPSO%JLve>m=*=rnPQIU*-o zW{NZf20P^%W|*L2=12o8i3|uddY~Fs3UnRNL=Uthdll$@peY`xFZ&YcEuh&Rs6V?6 zw0~4UV4(*Z$Oc3iSRT+a4^+qUfvy2s>4EB*6X?f4>palT>=U5pfi`%cq3lX1@ZB zh=spB(4j0c*1$4>HhZ8CvT;BwfFATfhqI?+4dKcunLF*I2Q`_!k2c5A=8^|$VJFZg zRd%tQD)CSL9?1f`!{6QEZx1w`nSqu7HF}^{Rtj_-&_oY(40{#mexNBHXeRp-=q;ex z9%vT34YYq8{Oy5evjK7NH_$Q{T#`Q3W`ArLZ`1?MW7^^*mv&a=!k8hg#Ca%`>n3D@vU1^>1 zyUSJgn=a~iPy(@W>7vsFp}pSp-=t}pK_D%`mg7k(^{N+n)$^J4p?KR5K&8vKT`tpg ztJ55X9o=fz>?CmiEtkt`-;3%SR4s)T+lONR+fj)Tv^vZifP&~GV%Z&+OX}C&pq{XZ zXhEpHE$Y@@hZPx)@;EITJwcRCMkM)=mu{N%dAh0Dbcp(K2A=IL2&QJMGwGeaU^oGp zR!7n(>c(LnLJi;Hkhvd~=obPmw;WseMx z4cQqg2${o9mz%528z%}vN2_DN0ru>0gRKKsq}lX2S0mGYK|1`0%LUdYEz%bdY^~m< zH8oGmx8zy!ThPG@w1$oaeb8}N*eDf&Dcz(P;tagpi~O>e8?u#{e&(7cWl=kaIT@L> zRaSl=%0bd#@|(jPO@v?AKy&v=DvJ>|Jw&7|8aS`*i+{j>1;^&*cH=_be*X%T4ML zb4An>M@bCQ^8KWnw0lL}BpSBs6*W8frYv#q-M`zYB7d<6lzlATmPnCUF7v^paT zfa&_wra)zIJg+oqLGyV^`6!xv2HJb5qk%(ikc|ejZ6uhaodkaa@#{*^l(Rx;A@P9P zLWzX7M`e~>V0lv(Q>L(RDVHGSh|IDZELS*7dS$zan-CF*Edjmk0e!KNm83M_`y zqw>Xk_Q2>^F}P{c=y=ig$gkwwDQ@SEK^488!U-bXbgE2CLKk)S7j#haR=xLdL4;ms*Kh6cyneXj(ryM;|X)^bzMy;N{+w; zoJVRu*VVoy&=OLK6p@;Kbe46Xx(DW@psPKObE(x?baEQa0?YLLmg+k`OO8pSF0fT& z9thIa(5cgOs4Ykrog%R2F}((u$vXS-)*=iD_mT9`MM6$vYGl}VORt`%+9_w*KNRmUbr9P2^X$4zr)Dfp25oB;-5lml=}_3EtNj8Tj-&vp z!I(2x9y0Cc(1|pRcgA~)^6tqdoBijWFy9=Z?_hDQJ*2CBgG6hdr&_bFrW~R_9b?2y z`JNjF$-AUvS|{umr5or0xqXim*+xsj-L>Sb)W&J&B=(ET)fx{evvqT5{g#ETbqm`g z{f1?TguUA?>}xdf6n0&Dozreeqe<8$5>_WYbm6XBWd%Il+Rc{xCp%kb^8u;)$pr^n z`y95`9xCr(tD#Z>n^)ztMU{*g5GMbZ9+|`d_u5!NGmYJAtymS&m6*KRDQA0ik8OAf}qZx@Qa z(1(y=l9_KCXp&W*H_oy;ECAi(Cr{>vHm%jh!%=wx&n!>Q(Yk_M@%;F?T@2Z&Aui@Pw& zU3l1C$ftshlo%wz?CSHChF>q0sveWSx0r!XCCT;4WWa}3gH=5#B$M87QbtO2Z zO&}p$te61*!I-u_jyW&s0b)o)qJD=Sx1|;kU`oDyPpfo}jmkeA>){`0YL!j9eG{lsvO@b5?R>-6UgdSJWXg4~B&^-$33ly9qfSFuUqr`TMkB<50 zHR_TF?O|+W6v#FIftL}*8TPYM<5_lR{3N3VPC@MK-3bx$C`diw8)XJKB(^v^M@(Y- zvWMG-{!G@((aM802c})4IC5xS!lxc~;IQhOV);nys_RgvlLL+ot%YYG&tYB$NK&6A z*%xW~cv~*QYhQtZZ@GJ=GdK*ieLA}i{29c57=0@IeU`O1c%39-P*x)UkSng|hGEy< zD}8o`z4vfm+Z`O(@0lXKP0bmYz|+skZF`b5XHthwjBr0;S^STB7 zzE3tf%vtDAdYH6wm>;CF2CSL(JJiLKTv<)$&Vn$m_E#X8x-^N-YV}xy9h#=$!+St_{g1u5v@PnyIR{WNdM-7%4O~aTWkIzc%hM)4q!TuSd2IF&(R5$+@zqNII#zwXzqaWl@qUf#? zT_FR*tH$t32{Hp;LZn4!*zt*B!*B9#s8Q72Msk}^;5JDjIzRft7cKIZ!DIBI^fXJ% z8KxTe6WcO2BW5J+87-Gc13uM`VoKg!@-IqZ>_|?3TfbBHto3AmwYl~|m_Vz8O_$$l zN8qCud3H%3K_}UyQzt$B3X3Y?ko?wnz;Ji(AbAc=D&&zk+OSt+K0uA~B~lqU$xX2I zMaUx8KBMF-xDR&I(V5&OT_@aOb`7H#xnQ+_CS8TzK&}zuOqv%2$E^R6L%#r$lE|@+ zq;HArF#m`wzx6VN()9hD*BH2U(KbP9BS~Bfz0&*3)Vss{3N^;U57{)=Mv{08>O5JO za-zz*6hlJW3gryMJ?QGBTlorpskG!E*nh!pZg;&vURU?0C`&@-&mknb35Nz4?6LU z0;O#g@i{bI&9!k^^dlcz z@_@q71;N?+FSmew?eq(1$Snra`huIjxt)H1=+2}mfu!eN=|^mJt@FWlcS=;6O)!MQ zatv}^ZJrHdA{o%GGARs**qRJ}9C>L~6foddbh(;sgZbcI(dpCTv`95?0gxVO?=~0B z!4D$!`UT6qgWDr_j&qCgHCqB6 z`e136=92X<-&WR48Ujh-Z;@U@sk&Kw8L@cd5Bs;$2pau+lp+3Y?fmm?C_2-8Ty0;v zR~cf+RT%b2S>#gt#p(f9li(eR*s(4=gbiI++XXtvN3m6aTRU=<1R44E29R&DdeuqC zNZ;4*@P!P!296?qj=5ZXhP3GXqWO2BT`15)IA7a-aV9!wt7oHswHFKC-3H=x- zmZ%db1NwoWw;>wpLgK_;0=CQe6`jsRkAo9&!JeLG(D#OlvM+bQ8`b8HY~!?O|Dik} zXt|iqzM5tjdL13K#sHK*6sBZ4%|7v1`zB}DzqL%tuwS#}SnRj(g)rdi0DK{2_PI@4 ztCZXnm6z(XwJ=*_8@J%e;*ydX2}$vZ#@KkD=R6QQuOH9;_`%~fkWa44mS24Yt0##+22@FJg>+&x@hLS1$~So=PX)KT9jZS z0rY2_IAivVMa4=J0smcjym)5OfF~9#npd=FKvO}HNz5$6H&q?pM!W~{Uczg<0vFZP#9xD+Kd<)|W2VaO5?} zbC8F8gU;}e1@#e^>lRjntH?`$A3o}Gt)m=abRM}H5fOkzuLgMBlB?pAK(MTs0IVRa&nQ+!Ut|8@(++VAm4z6 zc^C2=vJQ%UfP4`0U9d6_`Jk&V*M8(1kcY4nbGnNH6N?R+&3n+EMHY9b|Be?M!h7$R z4TDYm>5p^`-b%KxI03(MtS=rPdlDgy-!t*^N>FgMsxZj?{~H9O&>u!$I>yG#jb|xy zwc=2wpPS%ILdYwXtZHt8seya}lc@O$)yTjOX={C)>hv`lYjp?JWWRupT8lq*c@r&m z!B1bYQ*+}29}Y?xA7srA%FYVP9nW<0#`hWJFW{R_SVeBdj!$J-WG2^$eqY%Dn)WnX zF|ViQAd2hQmU+E=Z=qy_pWkJt=EX#h5dDG@EkV6ggN&&`VW~mEsX^LN{$xrDbX>z? zN(OdViqas7O)ZJlG@y8#Rh4wJHKP=OVQQs*$C4>3n;*5cBDMMpxq#1r=O}pizgx!# z1+P(!2?|@`lNMyGR;L9esvh$TGL8xgv+!O=`}%aQDaX=a2$;;_&7GTgrNrcGpy(RLI7a_VdMlE;OQ6!Kz9J`lg|Fp3`=gj`XDv zS%uKiH0kGe574{+Gbi8+i5`*FZ!%b(2NSQ!nJ`ruaEuRs=6KaByy{M-e=1t9&6l~u zl~xVR@>I0Anay}AAvOgEV|uUx^XDcMq{mOr1fxIO`c%CB5`_gG3?P4U+2yCAJ8h1V zYxwn?KieW%Y(-Z8IgxS|>-GXFxwXYK=k>w}nT}so7O)ZB;#p;ncviSPgf*+wO~Fq$ zt5`!-2*CbKTNxZct=%sRtF*FNl@;PmcB;~#O3|~#ZXrHexZ6?{s`eG;L=u31eM1u} z_zRn(sKDk|Js>u-^;HI3QdwUW>Ju!Kv9GHPDs4U|->K><<}uUqP<4oqQcRFfsL;S> zED!bRBEV704bZQPPnd9t)h|yFQ`pYs$u{z}h-k>Glg&{)CkR;82`^J{WlRKo=yANz z3y%S=LSPl*S8aOURs2QKLvogS@h8jpRAG)6!KyUKRd7X)kjL?GA=r!mF^+c<3aNnS zjGPH2%v5aj@_-^MS+a5dg->E<8U&4-FQ5w zP)5Ifh4zV|5PwB33K$))1_5kKjX{j0l%1>z6NmHq7@khxDL2S>I=mtZAwmr^)%G&c z&LQGXLT^Paw+4F<=qlX9a8DgKzLc%6HQ4OjvwzlsR$38DqkFcvTW#gIL2%!WbK^5` zKvD?-f{^G&HdGCz_)RFW57Xmf*?3CBi-6wmCQJqAd7Y=5dAgrjRvAp+DW(bIWPiD@0sRd8 zem89{^S1u{?p80Jrtma}r;B*Hnx}75YWfBfoDB88LR5oMA^EGk2IXfq!)_3-atT^~ z?<I3H*LnxYlyXTY35&Pdo4%ayZgp93P}Kd_1-X z>e2hkQ~~E%NGU7q5ElNC!YAKYx_e=1ALl#AQx(6#*PYVv;aFJtc#M)w=&4we&Z(se z)%z~o(_F$!Jbjy|pK|{F3jaOVmLTyMr~aW(gD1<0{rJvex@{mYGu@0hPwaNP7<+ zzV9P{jHsfGr+=fAHP(fRdwKl_o?hXpiY=@+u-y7E(-~@T8cO{ zBYlad8=0lv5dH!9$sgWV9rtja?|6ERQjH$JKy;#|P?MmPLZTNfSX>l8Q^2*dMav3G z7tAUW9-XnMprm+yQ9*gp(sK5{_0hfDh)}$^VD^%dlEpI@6&1~oA2Mj*z(K;33l@~} z;=rcJ=Ul44x|0?Y8po1fXp4HH=+Sw_<#eO%zE|6V4gH#OUYw=A-`%yQf4`y^weHJn z?D9*I?9AUchurTHTa#nmQt{8X*qT(Yofey<*Kv6|S7d(c<2$)eh3?!Mz{UVhQ4Wvp z9EZi#fZgXiciur{U#yS!a~}(FNK?Hr*l(M1O2knu^^L)L_gT`N=Q8^nHnD;EzM0_L zjGr&)X=au;hv-i#HFsXe>~ALM-CLhKe}R1t)V+VZ^FVfac4ro`p}#6m%f@Vo*Soh^ zcYcO5tlJQwPbro=b>~+0`Gy2v_pzgai5rKon;R0@oQ=V3DBe{Y6Wfo;mn!78!R+&m z$zmMy-ISnrUy6&XlxbF$v1tfsRhyDSv)vee+NOtGV_`=&_49k_ISvS!fz0o%!G336 Mm#bYdE)7xt2Uz_3ga7~l diff --git a/rose.c b/rose.c index f38fd8c..91e5935 100644 --- a/rose.c +++ b/rose.c @@ -14,8 +14,8 @@ static GtkWindow* window; // Search, find and url bar static struct { GtkHeaderBar *header; - GtkEntry *bar_line; - GtkEntryBuffer *bar_line_text; + GtkEntry *line; + GtkEntryBuffer *line_text; enum { _SEARCH, _FIND, _HIDDEN } entry_mode; } bar; @@ -248,10 +248,10 @@ void show_bar(GtkNotebook* notebook) { if (bar.entry_mode == _SEARCH) { const char* url = webkit_web_view_get_uri(notebook_get_webview(notebook)); - gtk_entry_set_placeholder_text(bar.bar_line, "Search"); - gtk_entry_buffer_set_text(bar.bar_line_text, url, strlen(url)); + gtk_entry_set_placeholder_text(bar.line, "Search"); + gtk_entry_buffer_set_text(bar.line_text, url, strlen(url)); gtk_widget_show(GTK_WIDGET(bar.header)); - gtk_window_set_focus(window, GTK_WIDGET(bar.bar_line)); + gtk_window_set_focus(window, GTK_WIDGET(bar.line)); } else if (bar.entry_mode == _HIDDEN) { gtk_widget_hide(GTK_WIDGET(bar.header)); } else { @@ -259,11 +259,11 @@ void show_bar(GtkNotebook* notebook) webkit_web_view_get_find_controller(notebook_get_webview(notebook))); if (search_text != NULL) - gtk_entry_buffer_set_text(bar.bar_line_text, search_text, strlen(search_text)); + gtk_entry_buffer_set_text(bar.line_text, search_text, strlen(search_text)); - gtk_entry_set_placeholder_text(bar.bar_line, "Find"); + gtk_entry_set_placeholder_text(bar.line, "Find"); gtk_widget_show(GTK_WIDGET(bar.header)); - gtk_window_set_focus(window, GTK_WIDGET(bar.bar_line)); + gtk_window_set_focus(window, GTK_WIDGET(bar.line)); } } @@ -415,11 +415,11 @@ void search_activate(GtkEntry* self, GtkNotebook* notebook) { if (bar.entry_mode == _SEARCH) load_uri(notebook_get_webview(notebook), - gtk_entry_buffer_get_text(bar.bar_line_text)); + gtk_entry_buffer_get_text(bar.line_text)); else if (bar.entry_mode == _FIND) webkit_find_controller_search( webkit_web_view_get_find_controller(notebook_get_webview(notebook)), - gtk_entry_buffer_get_text(bar.bar_line_text), + gtk_entry_buffer_get_text(bar.line_text), WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE | WEBKIT_FIND_OPTIONS_WRAP_AROUND, G_MAXUINT); @@ -434,11 +434,11 @@ void window_init(GtkNotebook* notebook) gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), 800); gtk_entry_buffer_new("", 0); - gtk_entry_set_alignment(bar.bar_line, 0.48); - gtk_widget_set_size_request(GTK_WIDGET(bar.bar_line), BAR_SIZE, -1); - gtk_header_bar_set_custom_title(bar.header, GTK_WIDGET(bar.bar_line)); + gtk_entry_set_alignment(bar.line, 0.48); + gtk_widget_set_size_request(GTK_WIDGET(bar.line), BAR_SIZE, -1); + gtk_header_bar_set_custom_title(bar.header, GTK_WIDGET(bar.line)); gtk_window_set_titlebar(window, GTK_WIDGET(bar.header)); - g_signal_connect(bar.bar_line, "activate", G_CALLBACK(search_activate), notebook); + g_signal_connect(bar.line, "activate", G_CALLBACK(search_activate), notebook); g_signal_connect(window, "key-press-event", G_CALLBACK(keypress), notebook); g_signal_connect(window, "destroy", G_CALLBACK(exit), notebook); } @@ -458,8 +458,8 @@ int main(int argc, char** argv) // Define GTK entities. These are declared globally window = GTK_WINDOW(gtk_window_new(0)); bar.header = GTK_HEADER_BAR(gtk_header_bar_new()); - bar.bar_line_text = GTK_ENTRY_BUFFER(gtk_entry_buffer_new("", 0)); - bar.bar_line = GTK_ENTRY(gtk_entry_new_with_buffer(bar.bar_line_text)); + bar.line_text = GTK_ENTRY_BUFFER(gtk_entry_buffer_new("", 0)); + bar.line = GTK_ENTRY(gtk_entry_new_with_buffer(bar.line_text)); gtk_window_set_default_size(window, WIDTH, HEIGHT); notebook = GTK_NOTEBOOK(gtk_notebook_new()); window_init(notebook);