From 004bdade8547ce72b81d8e0db5aea93e2da23551 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 14 Jun 2011 14:24:45 +0000 Subject: [PATCH] make bulb gadget change glow/brightness based on actual backlight brightness. SVN revision: 60306 --- data/themes/default.edc | 45 ++++++++++++++++++++++++--- data/themes/images/Makefile.am | 4 ++- data/themes/images/bulb-0.png | Bin 0 -> 2306 bytes data/themes/images/bulb-1.png | Bin 0 -> 1984 bytes data/themes/images/bulb-2.png | Bin 0 -> 648 bytes data/themes/images/bulb.png | Bin 3252 -> 0 bytes src/bin/e_border.c | 48 +++++++++++++++++++++++++++-- src/bin/e_border.h | 5 +++ src/bin/e_desk.c | 13 ++++++-- src/modules/backlight/e_mod_main.c | 20 ++++++++++-- 10 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 data/themes/images/bulb-0.png create mode 100644 data/themes/images/bulb-1.png create mode 100644 data/themes/images/bulb-2.png delete mode 100644 data/themes/images/bulb.png diff --git a/data/themes/default.edc b/data/themes/default.edc index 35a8e638f..cab01f2db 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -11886,18 +11886,55 @@ collections { /*** MOD: BACKLIGHT ***/ group { name: "e/modules/backlight/main"; images { - image: "bulb.png" COMP; + image: "bulb-0.png" COMP; + image: "bulb-1.png" COMP; + image: "bulb-2.png" COMP; } min: 16 16; max: 128 128; + script { + public message(Msg_Type:type, id, ...) { + if ((type == MSG_FLOAT) && (id == 0)) { + new Float:val; + val = getfarg(2); + set_tween_state(PART:"glow", val, "default", 0.0, "full", 0.0); + set_tween_state(PART:"glow2", val, "default", 0.0, "full", 0.0); + } + } + } parts { + part { + name: "glow"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "bulb-1.png"; + color: 255 255 255 0; + } + description { state: "full" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } part { name: "base"; - description { - state: "default" 0.0; + description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "bulb.png"; + image.normal: "bulb-0.png"; + } + } + part { + name: "glow2"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "bulb-2.png"; + color: 255 255 255 0; + } + description { state: "full" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } } diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index b9b20cefd..7366b2d92 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -454,4 +454,6 @@ flip_pmt.png \ flip_shad.png \ flip_t.png \ flip_colon.png \ -bulb.png +bulb-0.png \ +bulb-1.png \ +bulb-2.png diff --git a/data/themes/images/bulb-0.png b/data/themes/images/bulb-0.png new file mode 100644 index 0000000000000000000000000000000000000000..6b54be1613d1692290a7619ed1fde57a22f0a502 GIT binary patch literal 2306 zcmV+d3H|noP)Y)@65)zQApd}zs1FC?in}y;e z4vGIy#$)^S@ZQ8uln{GtlUdeF&}C!=@o-c8=Td6T)hIZ)*L_2n8+*Ubj9QcC+}$R&Ci1}|Q`7_U?+ z?-+)WbR5UYX0wa4v$Jz2PMlak4cdLUK#>suLb?fH1;|J#onFb<69UekKi`*3Cf^$x z8hSez3>N%;f5tS;xxT)>xo|i<4=e!14FwXy2N-|}^Z{X@1T07?Yu%Q$>jX?qP3;>W zAOERon!aE#xNMqc#^>{efZf0(@F_5dBH_it3E>AKKnz91b1CI=H|6an0pii4M?W7O z9sR)X_t!$9P(cV00^S6&z#o9esKL(xX`s?l$3g^wxNa*_%5=Ac?urw6Lx`q-dh=PePSeZX@eL_cFBfx~d_9^O3hfrh(P|nWp<=Ilo0`MF~=EN31ZwVa}aOcjQp9~HTz7-4x zt3IDkpd8l<@IRpI-djpp29|)D5MocK{dGjZg$ozn9v&Y4b|@4o1_FU1kU)9t&wxB& zq2hW4_13DW@aM*TPtYV}0aFMu(8(A)6L99t8DnH*do#2E;aqcMh!lz1udeq!_uuI z0yOfdd?AG*y={2XfTKr`n$c)qZL$}~+)e!Kk-J3mW zz|_=~FQ3n+P19UN+4@~zp2pjEo16A7qCEE!$|Sl5ogSA_rqDLpCO`;bWHOoR<;#~{ zN0&hjvN^*`HytnN-?$`Hy$HGmRsbo4FxtJb?NnF@F^p34w9dq$G$t(})=qINDD^DU zr1nAx0U-6m*B`e%2sMG)15~Ay^X=U0#RnLG)s%)7b#v2OSF7r55blH!L%;?7{RjH= z>amnE)2={L%DPUI!|mSdg#aHLt8uHb{rjkB;eKb`@gF_NgqEpollDqLC-d?Y@Hr|P zyrIucqh@-k4*IR(fdDU2z)z!+;{{KFu?^0T>1$pgY51R(u^mOxC&2gy=g0N6mkKWg z)KK+0ujrKq2t1gk7Xs>dP_-sJL)rQ)@Rn|~`dr(YToe3wm|=P)!1E+ZN?AoEMfZT$ zbh`&E>T6yR;3W}Y10kJ!c*PS`KJkuj2Hx!dO;}BYLRz-A;AIe5{jj#v&L%ts#-#?z z0d8ggaa6XqM}Pks@VdU{)*0KLXSA)#Qc7E=t|ltY^@1m?b%bMVt^t13Ku1vJaZnEL z7r^)Qv589S+tvWDw!8xL2_fAE+Sv2ivX-rDFEQByoB-C`hzLoo`LWm41q=8xjU!MdG0l!5hO20uBKNA4? ze7^Yj@#Cc{SFZf~`t|FcY~Mx4YlBkCv|g)A2q9>d1lIb2_4fZ&;9cMpaG$0yxUjHb z+`oTcT)K4W$?4OlA9N~zS5}90CN_bZjAUCe2O-2?fj{fR_ob9S-r|<{xpU`+@7=o> zpPZa5UA=nsVK){>yRtg01^G;`)g|?^czz4d{Dg)Hyf6*cktT?$`aJ9A@_5%bNE|zM z?DwOiqeoMz6vr^Tg%H=YS<6v19<#L%~u}HC4 zB$vxkC=|$Mvt+Yba=F~!CnqO=)J=JNvPI^=fdjt_1Omr)?b=0ue?R^G{lw#Ogb=F) zRI61gl?t|PW7{?>D=S!*g=JY3i$zMM5`{v6VzG#2S%kykbJNq)TbW7Q=-DQz{rmTS zlFQ}ZH%$}6Ffa^*dc97qR-;y{;W!S}Y8A(EHf-*-YPCu-nf%9t2M>PO3psnXP44*d zw@vj*&Ysi+ z&z?PdCKwDJ?_!s~I&|pJue;daDte*;*REZw$K!DZ2M0+c5+svJ1_uX`QexXSmSs^Y zl_-@;tM=}GmdoYU=4yd$+XMoEH@1Fq`{V8;jS z_<&d02M8hjhYuhAI1mUN?S>C9P4h3eZ{Pm#3;BNmAw&dKtn8<;rQL0@rqAfUef!>9 zUS1xJMxz7*0cy1xmSvI8=U1n^V`F3U47W+#z7Q c1=w!&MI$p0Q^KzmnZ#b=v%- zpVr=Z$G`7q#vc3kn-C!cj?K0R0RaU81;79h`4<5ogaC&C$LjF~MUE7}76B-15Y#|m zfxrU5Kw|Ma00Dsz5r{zg5F9>Mk1oce0kBOhP&go{f}#R~iUeRI0zd&!5D7p)0J8TZ z0KNp^fy0Bq2pld}L@@18rwd@4FiYa10QlKaG3Ee|;MTh}7`rzmzM0e85Vln{lNll7xf}trPjE{l{ zK-IIZE%}w(7XxzcEa*a8kak<3)dB#5ZkLEo2YkO{i7#Jm@5RST@Mc%`{Lj4~iSL1< zhY(#{7Q^EQ@SZqeI0c5L2BD!rZ~|-jj9a~bJ!F@bIaypJB%S}jAp}V9>2rH<>lqFH{>Ko%j}ZF^uwQnHq{W9wWAQZC1eMOv0;BCT@s!drPx~&* zvwp8!SQpNB>M!qt(RO_Q(PtutMp;?q07OrCb#1PXL3HcS*LCq}0h`~K5uW#Z1)*Di zz8(utW}s*m+9qsz092zap5q&!Xt>V9EBZCB2UxbZ4>BsubNJTH8?N*4%9wCH#;E{M zFE)wSK~d+{(rMSex1M&bn?0B&AglMww4u9e-&^O_(rM!XEb?t)O%5P=qN~ZrTL%>P4 zj-Lgh$nu0|d1$X)4XoueT1O=@Z{?pe9{`07iVCQFtCQ|l?_XC>ctu`Tcov8<=K!hL zZuS0kGfo-1eRu#-CZ}R}HDs5T^?5x@^kK!PLCAukjtkkPW!dXyytPRHsMl9pHRxH_ zmN;2lG{x)t=Jq63)V|v1WO326t}SW8Z6x`JOv?rkB`~eAh6pUba{FSMxUAlph849P zPm7h?7xh@<*tfES$p(;QZlffoY&0O}&SnK>em^bCYTx`mAm`2+Ntg8Wn`Zd{Nc`g{ zgG0bT7us3krY-y+?Gr)(y3p3LP0Y}cYI*knmAa-{E}sh0ZkGyX%2o!tjBPAlsUh>R zI1fOSw^ylaxv$b#MS&fMndg?VCG`dpZy(|wFejD=KvipmzE9BYjvaKIr8UFMbIaI- zbX9Ok_ERhmK!_w=t*SPhh)zeHJWKphK*>9o`kRbxEMBO(V}@k|5OJQK%Lbx-zTYVm z%u!e&biUt_^+i=>(lw-7J^;kU%D7-*i7#KxfXu+A4I-<3^LtBt`KlFGLM{G709X}5 ztI?@O1KWG?F->4v?rvIE)OMUO^6aZKaI_Ap}_XVFv=Elz4ON z1o;3seDJtH8M`xj@*2YP^HSF)j7h{7IfUmsqbIM;IA!eq;Q_1)NUC~?dT0eZ-IhT-+U|UheKIOPGT-tT~hoc7!@T|!>-(So1+Jtg7^Aa!`>94woP&7 zv1z}_JBQ%CeslC-Q^h4?9L5#p0xJfvB7(Satwc?O-S3Y7bfc*E)1c%DF4KnYj{kH+ z7EM*@Jc+eLiL5YfEJr~f95sY8(a58Wi{n0e7tlX`59~j0008G4ltxTB=ea4YG|RiO zrh%}7zh22=XU;Le7u6!+wsfdoX!bwuUg2E$l750nFM?0L(goS=$MKSqCs{I{`530A_7-58yv3@DkCV SQwrq(00002?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4b-NGMR0HcWq2PJoQw>>EaK!!;Se(a&G!qYhCth+_`jF z@ziwCN7czNTYpqD2iQePap@GWbnL71kj=DW`#K=019Rt|Qq-Cy$OlHnC|qta)7 zkJfK}Dc@o@W0vK|8%tw%KbU-d-P{#Ed%adqwmVQAZ2n75bI)hlEh2TVZkv2HTkH3W zf!Ub1UGHw>nrGFAP5Ek#z1Ie-{C8ZW!DZtp9v>FH-SAN8t89l~41an9R=j?iwby0t uuP2>cALKWFd(T|dkkOby331KtfV}da?lOKS9ZO)UVeoYIb6Mw<&;$T)0T{mk literal 0 HcmV?d00001 diff --git a/data/themes/images/bulb.png b/data/themes/images/bulb.png deleted file mode 100644 index 105a7431f4c5dbe380562bfd8b60dcd16403e152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3252 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

q}(5V)6|EciMnEE&m5ZXD>r%!iQG?0000jv4 diff --git a/src/bin/e_border.c b/src/bin/e_border.c index dcdb0b356..69d03f6df 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -2986,7 +2986,7 @@ _e_border_shape_input_rectangle_set(E_Border* bd) { if (bd->visible) // not shaped input { - if (!bd->comp_hidden) + if (!((bd->comp_hidden) || (bd->tmp_input_hidden > 0))) ecore_x_composite_window_events_enable(bd->win); else ecore_x_composite_window_events_disable(bd->win); @@ -3132,7 +3132,7 @@ _e_border_show(E_Border *bd) return; } - if (!bd->comp_hidden) + if (!((bd->comp_hidden) || (bd->tmp_input_hidden > 0))) { _e_border_shape_input_rectangle_set(bd); // not anymore @@ -8914,7 +8914,49 @@ e_border_comp_hidden_set(E_Border *bd, bd->comp_hidden = hidden; - if (bd->comp_hidden) + if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0)) + { + ecore_x_composite_window_events_disable(bd->win); + ecore_x_window_ignore_set(bd->win, EINA_TRUE); + } + else + { + _e_border_shape_input_rectangle_set(bd); + ecore_x_window_ignore_set(bd->win, EINA_FALSE); + } +} + +EAPI void +e_border_tmp_input_hidden_push(E_Border *bd) +{ + E_OBJECT_CHECK(bd); + E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); + + bd->tmp_input_hidden++; + if (bd->tmp_input_hidden != 1) return; + + if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0)) + { + ecore_x_composite_window_events_disable(bd->win); + ecore_x_window_ignore_set(bd->win, EINA_TRUE); + } + else + { + _e_border_shape_input_rectangle_set(bd); + ecore_x_window_ignore_set(bd->win, EINA_FALSE); + } +} + +EAPI void +e_border_tmp_input_hidden_pop(E_Border *bd) +{ + E_OBJECT_CHECK(bd); + E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); + + bd->tmp_input_hidden--; + if (bd->tmp_input_hidden != 0) return; + + if ((bd->comp_hidden) || (bd->tmp_input_hidden > 0)) { ecore_x_composite_window_events_disable(bd->win); ecore_x_window_ignore_set(bd->win, EINA_TRUE); diff --git a/src/bin/e_border.h b/src/bin/e_border.h index 97c193d39..886e07247 100644 --- a/src/bin/e_border.h +++ b/src/bin/e_border.h @@ -566,9 +566,12 @@ struct _E_Border unsigned char post_move : 1; unsigned char post_resize : 1; unsigned char post_show : 1; + Ecore_Idle_Enterer *post_job; Eina_Bool argb; + + int tmp_input_hidden; }; struct _E_Border_Pending_Move_Resize @@ -709,6 +712,8 @@ EAPI E_Border *e_border_under_pointer_get(E_Desk *desk, E_Border *exclude); EAPI int e_border_pointer_warp_to_center(E_Border *bd); EAPI void e_border_comp_hidden_set(E_Border *bd, Eina_Bool hidden); +EAPI void e_border_tmp_input_hidden_push(E_Border *bd); +EAPI void e_border_tmp_input_hidden_pop(E_Border *bd); extern EAPI int E_EVENT_BORDER_RESIZE; extern EAPI int E_EVENT_BORDER_MOVE; diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index f180e842d..46ffdce18 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -597,6 +597,7 @@ _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy) } else if ((bd->desk == desk) && (!bd->sticky)) { + e_border_tmp_input_hidden_push(bd); bd->fx.start.t = t; if (mode == 1) { @@ -670,11 +671,19 @@ _e_desk_show_end(E_Desk *desk) if (!bd->visible) e_border_show(bd); } + e_border_tmp_input_hidden_pop(bd); } } - if (e_config->focus_last_focused_per_desktop) - e_desk_last_focused_focus(desk); + if ((e_config->focus_policy == E_FOCUS_MOUSE) || + (e_config->focus_policy == E_FOCUS_SLOPPY)) + { + if (e_config->focus_last_focused_per_desktop) + { + if (!e_border_under_pointer_get(desk, NULL)) + e_desk_last_focused_focus(desk); + } + } e_container_border_list_free(bl); ecore_x_window_shadow_tree_flush(); diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c index c8fab4dec..cc458579a 100644 --- a/src/modules/backlight/e_mod_main.c +++ b/src/modules/backlight/e_mod_main.c @@ -41,6 +41,18 @@ static E_Action *act = NULL; static void _backlight_popup_free(Instance *inst); +static void +_backlight_gadget_update(Instance *inst) +{ + Edje_Message_Float msg; + + msg.val = inst->val; + if (msg.val < 0.0) msg.val = 0.0; + else if (msg.val > 1.0) msg.val = 1.0; + printf("%3.3f\n", msg.val); + edje_object_message_send(inst->o_backlight, EDJE_MESSAGE_FLOAT, 0, &msg); +} + static void _backlight_input_win_del(Instance *inst) { @@ -91,6 +103,7 @@ _backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event) inst->val = v; e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL); e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0); + _backlight_gadget_update(inst); } else if ((!strcmp(keysym, "Down")) || (!strcmp(keysym, "Right")) || @@ -107,6 +120,7 @@ _backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event) inst->val = v; e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL); e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0); + _backlight_gadget_update(inst); } else if ((!strcmp(keysym, "0")) || (!strcmp(keysym, "1")) || @@ -124,6 +138,7 @@ _backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event) inst->val = v; e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL); e_backlight_level_set(inst->gcc->gadcon->zone, v, 0.0); + _backlight_gadget_update(inst); } else { @@ -149,7 +164,7 @@ _backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event) mod |= E_BINDING_MODIFIER_WIN; if (bind->key && (!strcmp(bind->key, ev->keyname)) && - ((bind->modifiers == mod) || (bind->any_mod))) + ((bind->modifiers == (int)mod) || (bind->any_mod))) { _backlight_popup_free(inst); break; @@ -199,9 +214,9 @@ static void _slider_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Instance *inst = data; - printf("ch cb %3.3f\n", inst->val); e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL); e_backlight_level_set(inst->gcc->gadcon->zone, inst->val, 0.0); + _backlight_gadget_update(inst); } static void @@ -215,6 +230,7 @@ _backlight_popup_new(Instance *inst) e_backlight_update(); e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL); inst->val = e_backlight_level_get(inst->gcc->gadcon->zone); + _backlight_gadget_update(inst); inst->popup = e_gadcon_popup_new(inst->gcc); evas = inst->popup->win->evas;