1 Mon Mar 2 10:30:41 W. Europe Standard Time 2009 Tuomo Valkonen <tuomov@iki.fi>
2 * Don't symlink look.lua, but rather dopath from within
3 Mon Mar 2 10:09:36 W. Europe Standard Time 2009 Tuomo Valkonen <tuomov@iki.fi>
4 * Fix frame_clear_shape
5 Sun Feb 8 23:37:32 W. Europe Standard Time 2009 Tuomo Valkonen <tuomov@iki.fi>
7 Fri Jan 9 23:19:32 W. Europe Standard Time 2009 Tuomo Valkonen <tuomov@iki.fi>
9 diff -rN -u old-ion-3/config.h new-ion-3/config.h
10 --- old-ion-3/config.h 2009-05-26 19:09:08.172555900 +0200
11 +++ new-ion-3/config.h 2009-05-26 19:09:15.984855900 +0200
17 * Copyright (c) Tuomo Valkonen 1999-2009.
18 diff -rN -u old-ion-3/etc/Makefile new-ion-3/etc/Makefile
19 --- old-ion-3/etc/Makefile 2009-05-26 19:09:15.359871900 +0200
20 +++ new-ion-3/etc/Makefile 2009-05-26 19:09:16.344221700 +0200
22 ETC = cfg_ion.lua cfg_ioncore.lua cfg_kludges.lua cfg_defaults.lua \
23 cfg_tiling.lua cfg_query.lua cfg_menu.lua \
24 cfg_statusbar.lua cfg_dock.lua cfg_layouts.lua \
26 look_brownsteel.lua look_clean.lua look_dusky.lua \
27 look_greyviolet.lua look_ios.lua look_cleanviolet.lua \
28 look_simpleblue.lua look_cleanios.lua look_newviolet.lua \
30 ######################################
33 - rm -f $(ETCDIR)/look.lua
34 - ln -s look_newviolet.lua $(ETCDIR)/look.lua
35 diff -rN -u old-ion-3/etc/look.lua new-ion-3/etc/look.lua
36 --- old-ion-3/etc/look.lua 1970-01-01 01:00:00.000000000 +0100
37 +++ new-ion-3/etc/look.lua 2009-05-26 19:09:16.484843100 +0200
39 +dopath('look_newviolet')
40 diff -rN -u old-ion-3/ioncore/clientwin.c new-ion-3/ioncore/clientwin.c
41 --- old-ion-3/ioncore/clientwin.c 2009-05-26 19:09:15.562991700 +0200
42 +++ new-ion-3/ioncore/clientwin.c 2009-05-26 19:09:17.125451700 +0200
43 @@ -1015,10 +1015,11 @@
45 if(cwin->flags&CLIENTWIN_P_WM_TAKE_FOCUS){
46 Time stmp=ioncore_get_timestamp();
47 + region_finalise_focusing((WRegion*)cwin, cwin->win, warp, stmp);
48 send_clientmsg(cwin->win, ioncore_g.atom_wm_take_focus, stmp);
50 + region_finalise_focusing((WRegion*)cwin, cwin->win, warp, CurrentTime);
53 - region_finalise_focusing((WRegion*)cwin, cwin->win, warp);
55 XSync(ioncore_g.dpy, 0);
57 diff -rN -u old-ion-3/ioncore/focus.c new-ion-3/ioncore/focus.c
58 --- old-ion-3/ioncore/focus.c 2009-05-26 19:09:15.531742500 +0200
59 +++ new-ion-3/ioncore/focus.c 2009-05-26 19:09:18.219173700 +0200
61 /*Time ioncore_focus_time=CurrentTime;*/
64 -void region_finalise_focusing(WRegion* reg, Window win, bool warp)
65 +void region_finalise_focusing(WRegion* reg, Window win, bool warp, Time time)
72 region_set_await_focus(reg);
73 - /*xwindow_do_set_focus(win);*/
74 - XSetInputFocus(ioncore_g.dpy, win, RevertToParent,
75 - CurrentTime/*ioncore_focus_time*/);
76 - /*ioncore_focus_time=CurrentTime;*/
77 + XSetInputFocus(ioncore_g.dpy, win, RevertToParent, time);
81 diff -rN -u old-ion-3/ioncore/focus.h new-ion-3/ioncore/focus.h
82 --- old-ion-3/ioncore/focus.h 2009-05-26 19:09:15.484868700 +0200
83 +++ new-ion-3/ioncore/focus.h 2009-05-26 19:09:18.250422900 +0200
85 extern void region_warp(WRegion *reg); /* maybewarp TRUE */
86 extern void region_set_focus(WRegion *reg); /* maybewarp FALSE */
88 -extern void region_finalise_focusing(WRegion* reg, Window win, bool warp);
89 +extern void region_finalise_focusing(WRegion* reg, Window win, bool warp, Time time);
91 DYNFUN void region_do_set_focus(WRegion *reg, bool warp);
92 extern void region_do_warp(WRegion *reg);
93 diff -rN -u old-ion-3/ioncore/frame-draw.c new-ion-3/ioncore/frame-draw.c
94 --- old-ion-3/ioncore/frame-draw.c 2009-05-26 19:09:15.422370300 +0200
95 +++ new-ion-3/ioncore/frame-draw.c 2009-05-26 19:09:18.266047500 +0200
98 void frame_clear_shape(WFrame *frame)
100 - grbrush_set_window_shape(frame->brush, TRUE, 0, NULL);
101 + if(frame->brush!=NULL)
102 + grbrush_set_window_shape(frame->brush, TRUE, 0, NULL);
106 diff -rN -u old-ion-3/ioncore/group.c new-ion-3/ioncore/group.c
107 --- old-ion-3/ioncore/group.c 2009-05-26 19:09:15.453619500 +0200
108 +++ new-ion-3/ioncore/group.c 2009-05-26 19:09:18.969154500 +0200
110 if(st!=NULL && st->reg!=NULL)
111 region_do_set_focus(st->reg, warp);
113 - region_finalise_focusing((WRegion*)ws, ws->dummywin, warp);
114 + region_finalise_focusing((WRegion*)ws, ws->dummywin, warp, CurrentTime);
118 diff -rN -u old-ion-3/ioncore/window.c new-ion-3/ioncore/window.c
119 --- old-ion-3/ioncore/window.c 2009-05-26 19:09:15.437994900 +0200
120 +++ new-ion-3/ioncore/window.c 2009-05-26 19:09:21.562838100 +0200
123 void window_do_set_focus(WWindow *wwin, bool warp)
125 - region_finalise_focusing((WRegion*)wwin, wwin->win, warp);
126 + region_finalise_focusing((WRegion*)wwin, wwin->win, warp, CurrentTime);
130 diff -rN -u old-ion-3/mod_tiling/tiling.c new-ion-3/mod_tiling/tiling.c
131 --- old-ion-3/mod_tiling/tiling.c 2009-05-26 19:09:15.437994900 +0200
132 +++ new-ion-3/mod_tiling/tiling.c 2009-05-26 19:09:24.609635100 +0200
135 void tiling_fallback_focus(WTiling *ws, bool warp)
137 - region_finalise_focusing((WRegion*)ws, ws->dummywin, warp);
138 + region_finalise_focusing((WRegion*)ws, ws->dummywin, warp, CurrentTime);