?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
updated on Thu Jan 12 20:00:29 UTC 2012
[aur-mirror.git] / fvwm-patched / 11-MultiBorder.patch
blobb7a11087e6ffc805f4b48b9bdf0fb2acde4b51fc
1 diff -U3 -r fvwm/borders.c fvwm/borders.c
2 --- fvwm/borders.c 2011-12-09 20:59:40.674170242 +0100
3 +++ fvwm/borders.c 2011-12-09 21:31:27.171864221 +0100
4 @@ -1647,6 +1647,7 @@
5 True : False;
6 xgcv.fill_style = FillSolid;
7 valuemask = GCFillStyle;
8 +
9 if (!bg->flags.use_pixmap)
10 {
11 /* solid pixel */
12 @@ -1839,13 +1840,26 @@
13
14 static void border_get_border_background(
15 pixmap_background_type *bg, common_decorations_type *cd,
16 - rectangle *part_g, rectangle *relative_g, int *free_bg_pixmap, Window w, window_parts part)
17 + rectangle *part_g, rectangle *relative_g, int *free_bg_pixmap, Window w, window_parts part, FvwmPicture *fp)
18 {
19 *free_bg_pixmap = False;
20
21 - if (cd->texture_pixmap)
22 + if (fp)
23 {
24 bg->flags.use_pixmap = 1;
25 + bg->pixmap.p = fp->picture;
26 + bg->pixmap.g.width = fp->width;
27 + bg->pixmap.g.height = fp->height;
28 + bg->pixmap.shape = None;
29 + bg->pixmap.alpha = None;
30 + bg->pixmap.depth = fp->depth;
31 + bg->pixmap.flags.is_tiled = 1;
32 + bg->pixmap.flags.is_stretched = 0;
33 + bg->pixmap.fra.mask = 0;
34 + }
35 + else if (cd->texture_pixmap)
36 + {
37 + bg->flags.use_pixmap = 1;
38 bg->pixmap.p = cd->texture_pixmap;
39 bg->pixmap.g.width = cd->texture_pixmap_width;
40 bg->pixmap.g.height = cd->texture_pixmap_height;
41 @@ -1940,6 +1954,18 @@
42 return;
43 }
44
45 +#define DRAWBORDER(PIX,X,Y,WIDTH,HEIGHT) \
46 + { \
47 + fp = df->u.mb.pixmaps[PIX]; \
48 + border_get_border_background( \
49 + &bg, cd, &part_g, &relative_g, &free_bg_pixmap, w, PART_NONE, fp); \
50 + r.x = X; \
51 + r.y = Y; \
52 + r.width = WIDTH; \
53 + r.height = HEIGHT; \
54 + border_fill_pixmap_background(p, &r, &bg, cd); \
55 + }
56 +
57 static void border_draw_one_border_part(
58 common_decorations_type *cd, FvwmWindow *fw, rectangle *sidebar_g,
59 rectangle *frame_g, border_relief_descr *br, window_parts part,
60 @@ -1952,6 +1978,7 @@
61 Pixmap p;
62 Window w;
63 Bool free_bg_pixmap = False;
64 + int x, y, width, height;
65
66 /* make a pixmap */
67 border_get_part_geometry(fw, part, sidebar_g, &part_g, &w);
68 @@ -1965,8 +1992,28 @@
69 relative_g.height = fw->g.frame.height;
70 relative_g.x = part_g.x;
71 relative_g.y = part_g.y;
72 - border_get_border_background(
73 - &bg, cd, &part_g, &relative_g, &free_bg_pixmap, w, part);
74 +
75 + DecorFace* df;
76 + FvwmPicture* fp = 0;
77 + df = border_get_border_style(fw, (Scr.Hilite == fw));
78 + if (DFS_FACE_TYPE(df->style) == MultiBorder)
79 + {
80 + int id = -1;
81 + if (part==PART_BORDER_NW) id = 0;
82 + if (part==PART_BORDER_N) id = 1;
83 + if (part==PART_BORDER_NE) id = 2;
84 + if (part==PART_BORDER_E) id = 3;
85 + if (part==PART_BORDER_SE) id = 4;
86 + if (part==PART_BORDER_S) id = 5;
87 + if (part==PART_BORDER_SW) id = 6;
88 + if (part==PART_BORDER_W) id = 7;
89 +
90 + if (id>=0 && df->u.mb.pixmaps[id])
91 + {
92 + fp = df->u.mb.pixmaps[id];
93 + }
94 + }
95 +
96 if (cd->texture_pixmap)
97 {
98 switch (part)
99 @@ -2009,13 +2056,100 @@
100 bg.pixmap.g.x = 0;
101 bg.pixmap.g.y = 0;
102 }
103 - /* set the geometry for drawing the Tiled pixmap; maybe add the relief
104 - * as offset? */
105 - pix_g.x = 0;
106 - pix_g.y = 0;
107 - pix_g.width = part_g.width;
108 - pix_g.height = part_g.height;
109 - border_fill_pixmap_background(p, &pix_g, &bg, cd);
110 +
111 + border_get_border_background(
112 + &bg, cd, &part_g, &relative_g, &free_bg_pixmap, w, PART_NONE, fp);
113 +
114 + int px = bg.pixmap.g.x;
115 + int py = bg.pixmap.g.y;
116 +
117 + if (fp)
118 + {
119 + /* Position pixmap so that it's aligned to the edge of the window */
120 + if (part & PART_BOTTOM)
121 + {
122 + bg.pixmap.g.y = fp->height - sidebar_g->y;
123 + if (part == PART_BORDER_S)
124 + {
125 + bg.pixmap.g.y = fp->height - fw->boundary_width;
126 + }
127 + }
128 + if (part & PART_RIGHT)
129 + {
130 + bg.pixmap.g.x = fp->width - sidebar_g->x;
131 + if (part == PART_BORDER_E)
132 + {
133 + bg.pixmap.g.x = fp->width - fw->boundary_width;
134 + }
135 + }
136 + }
137 +
138 + /* set the geometry for drawing the Tiled pixmap; maybe add the relief
139 + * as offset? */
140 + pix_g.x = 0;
141 + pix_g.y = 0;
142 + pix_g.width = part_g.width;
143 + pix_g.height = part_g.height;
144 +
145 + border_fill_pixmap_background(p, &pix_g, &bg, cd);
146 +
147 + bg.pixmap.g.x = px;
148 + bg.pixmap.g.y = py;
149 +
150 + if (fp)
151 + {
152 + height = pix_g.height;
153 + width = pix_g.width;
154 + x = pix_g.x;
155 + y = pix_g.y;
156 +
157 + /* draw parts from other borders that overflow because of their width/height */
158 + rectangle r;
159 + if (part==PART_BORDER_S)
160 + {
161 + DRAWBORDER(6, pix_g.x - sidebar_g->x, fw->boundary_width - fp->height, fp->width - sidebar_g->x, height);
162 + DRAWBORDER(4, pix_g.width - fp->width + sidebar_g->x, fw->boundary_width - fp->height, fp->width - sidebar_g->x, height);
163 + }
164 + if (!IS_SHADED(fw))
165 + {
166 + if (part==PART_BORDER_E)
167 + {
168 + DRAWBORDER(2, fw->boundary_width - fp->width, pix_g.y - sidebar_g->y, width, fp->height - sidebar_g->y);
169 + DRAWBORDER(4, fw->boundary_width - fp->width, pix_g.height - fp->height + sidebar_g->y, width, fp->height - sidebar_g->y);
170 + }
171 + if (part==PART_BORDER_W)
172 + {
173 + DRAWBORDER(0, x, pix_g.y - sidebar_g->y, width, fp->height - sidebar_g->y);
174 + DRAWBORDER(6, x, pix_g.height - fp->height + sidebar_g->y, width, fp->height - sidebar_g->y);
175 + }
176 + }
177 + if (part==PART_BORDER_N)
178 + {
179 + DRAWBORDER(2, pix_g.width - fp->width + sidebar_g->x, y, fp->width - sidebar_g->x, height);
180 + DRAWBORDER(0, pix_g.x - fp->width + sidebar_g->x, y, fp->width - sidebar_g->x, height);
181 + }
182 + /* Use the top border for the whole height of the titlebar, overflowing to parts of the bottom corners if shaded */
183 + if (IS_SHADED(fw))
184 + {
185 + if (part==PART_BORDER_W)
186 + {
187 + DRAWBORDER(0, 0, -height, width, height);
188 + }
189 + if (part==PART_BORDER_SW)
190 + {
191 + DRAWBORDER(0, 0, -height*2, width, height - fw->boundary_width);
192 + }
193 + if (part==PART_BORDER_E)
194 + {
195 + DRAWBORDER(2, fw->boundary_width - fp->width, -height, width, height);
196 + }
197 + if (part==PART_BORDER_SE)
198 + {
199 + DRAWBORDER(2, width - fp->width, -height*2, width, height - fw->boundary_width);
200 + }
201 + }
202 + }
203 +
204 if (HAS_FLUXBOX_HANDLES(fw) && (part & PART_BOTTOM))
205 {
206 pix_g.y = part_g.height - fw->boundary_width;
207 @@ -2032,6 +2166,7 @@
208 border_fill_fluxbox_handle(p, &pix_g, cd, !(part & PART_BORDER_S));
209 }
210 }
211 +
212 if (free_bg_pixmap && bg.pixmap.p)
213 {
214 XFreePixmap(dpy, bg.pixmap.p);
215 @@ -2086,7 +2221,7 @@
216 do_clear);
217 }
218 }
219 -
220 +
221 return;
222 }
223
224 @@ -3711,7 +3846,7 @@
225 relative_g.x = button_g->x;
226 relative_g.y = button_g->y;
227 border_get_border_background(
228 - &bg, td->cd, button_g, &relative_g, &free_bg_pixmap, w, PART_NONE);
229 + &bg, td->cd, button_g, &relative_g, &free_bg_pixmap, w, PART_NONE, (FvwmPicture *)NULL);
230 bg.pixmap.g.x = 0;
231 bg.pixmap.g.y = 0;
232 /* set the geometry for drawing the Tiled pixmap;
233 @@ -4158,7 +4293,7 @@
234 relative_g.y = td->layout.title_g.y;
235 border_get_border_background(
236 &bg, td->cd, &td->layout.title_g, &relative_g,
237 - &free_bg_pixmap, w, PART_NONE);
238 + &free_bg_pixmap, w, PART_NONE, (FvwmPicture *)NULL);
239 bg.pixmap.g.x = 0;
240 bg.pixmap.g.y = 0;
241 /* set the geometry for drawing the Tiled pixmap;
242 diff -U3 -r fvwm/builtins.c fvwm/builtins.c
243 --- fvwm/builtins.c 2011-12-09 21:00:47.315799724 +0100
244 +++ fvwm/builtins.c 2011-12-09 21:31:27.171864221 +0100
245 @@ -794,6 +794,50 @@
246 return s;
247 }
248
249 +static char *ReadMultiBorderDecor(char *s, DecorFace *df)
250 +{
251 + FvwmPictureAttributes fpa;
252 + FvwmPicture **pm;
253 + char *token;
254 + int x;
255 + int y;
256 +
257 + pm = df->u.mb.pixmaps;
258 + df->style.face_type = MultiBorder;
259 +
260 + for (x = 0; x < 8; x++)
261 + {
262 + s = DoPeekToken(s, &token, " ", NULL, NULL);
263 + if (s == NULL)
264 + {
265 + break;
266 + }
267 + if (pm[x])
268 + {
269 + PDestroyFvwmPicture(dpy, pm[x]);
270 + }
271 + pm[x] = PCacheFvwmPicture(dpy, Scr.NoFocusWin, NULL,
272 + token, fpa);
273 +
274 + if (!pm[x])
275 + {
276 + fvwm_msg(ERR, "ReadMultiBorderDecor",
277 + "Pixmap '%s' could not be loaded",
278 + token);
279 + for(y = 0; y < x; y++)
280 + {
281 + if (pm[y])
282 + {
283 + PDestroyFvwmPicture(dpy, pm[y]);
284 + }
285 + }
286 + return NULL;
287 + }
288 + }
289 +
290 + return s;
291 +}
292 +
293 /*
294 *
295 * DestroyFvwmDecor -- frees all memory assocated with an FvwmDecor
296 @@ -1501,6 +1545,14 @@
297 free(df->u.mp.pixels);
298 }
299 break;
300 + case MultiBorder:
301 + for (i = 0; i < 8; i++)
302 + {
303 + if (df->u.mb.pixmaps[i])
304 + {
305 + PDestroyFvwmPicture(dpy, df->u.mb.pixmaps[i]);
306 + }
307 + }
308 case VectorButton:
309 case DefaultVectorButton:
310 if (df->u.vector.x)
311 @@ -1870,6 +1922,15 @@
312 return False;
313 }
314 }
315 + else if (strncasecmp(style,"MultiBorder",11)==0)
316 + {
317 + s = ReadMultiBorderDecor(s, df);
318 + if (!s)
319 + {
320 + return False;
321 + }
322 + DFS_FACE_TYPE(df->style) = MultiBorder;
323 + }
324 else if (FMiniIconsSupported &&
325 strncasecmp (style, "MiniIcon", 8) == 0)
326 {
327 diff -U3 -r fvwm/menus.c fvwm/menus.c
328 --- fvwm/menus.c 2011-12-09 20:59:40.677503490 +0100
329 +++ fvwm/menus.c 2011-12-09 21:31:27.175197468 +0100
330 @@ -2636,6 +2636,41 @@
331 return do_clear;
332 }
333
334 +#define DRAWMENUBORDER(NUM, XX, YY) XCopyArea(\
335 + dpy, pm[(NUM)]->picture, MR_WINDOW(mr), Scr.TransMaskGC,\
336 + 0, 0, pm[(NUM)]->width, pm[(NUM)]->height, (XX), (YY))
337 +static Bool paint_menu_multipixmap_background(
338 + MenuRoot *mr, XEvent *pevent)
339 +{
340 + MenuStyle *ms = MR_STYLE(mr);
341 + int width, height, x, y;
342 + int bw = MST_BORDER_WIDTH(mr);
343 + FvwmPicture **pm;
344 + pm = ST_FACE(ms).u.mb.pixmaps;
345 +
346 + width = MR_WIDTH(mr);
347 + height = MR_HEIGHT(mr);
348 +
349 + FvwmPicture *p = pm[0];
350 +
351 + width = MR_WIDTH(mr);
352 + height = MR_HEIGHT(mr);
353 +
354 + x = 0;
355 +
356 + for (x = 0; x < width; x+=pm[1]->width) DRAWMENUBORDER(1, x, 0);
357 + for (x = 0; x < width; x+=pm[5]->width) DRAWMENUBORDER(5, x, height-pm[5]->height);
358 + for (x = 0; x < height; x+=pm[3]->height) DRAWMENUBORDER(3, width-pm[3]->height, x);
359 + for (x = 0; x < height; x+=pm[7]->height) DRAWMENUBORDER(7, 0, x);
360 +
361 + DRAWMENUBORDER(0, 0, 0);
362 + DRAWMENUBORDER(2, width-pm[2]->width, 0);
363 + DRAWMENUBORDER(4, width-pm[4]->width, height-pm[4]->height);
364 + DRAWMENUBORDER(6, 0, height-pm[6]->height);
365 +
366 + return False;
367 +}
368 +
369 static Bool paint_menu_pixmap_background(
370 MenuRoot *mr, XEvent *pevent)
371 {
372 @@ -2738,15 +2773,20 @@
373 {
374 /* Only the border was obscured. Redraw it centrally instead of
375 * redrawing several menu items. */
376 - RelieveRectangle(
377 - dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1,
378 - MR_HEIGHT(mr) - 1, (Pdepth < 2) ?
379 - SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) :
380 - HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)),
381 - SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)), bw);
382 + if (ms && ST_FACE(ms).type == MultiPixmapMenu)
383 {
384 - return;
385 + paint_menu_multipixmap_background(mr, pevent);
386 }
387 + else
388 + {
389 + RelieveRectangle(
390 + dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1,
391 + MR_HEIGHT(mr) - 1, (Pdepth < 2) ?
392 + SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) :
393 + HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)),
394 + SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)), bw);
395 + }
396 + return;
397 }
398 MR_IS_PAINTED(mr) = 1;
399 /* paint the menu background */
400 @@ -2811,6 +2851,9 @@
401 case PixmapMenu:
402 do_clear = paint_menu_pixmap_background(mr, pevent);
403 break;
404 + case MultiPixmapMenu:
405 + do_clear = paint_menu_multipixmap_background(mr, pevent);
406 + break;
407 case TiledPixmapMenu:
408 XSetWindowBackgroundPixmap(
409 dpy, MR_WINDOW(mr), ST_FACE(ms).u.p->picture);
410 @@ -2823,11 +2866,14 @@
411 }
412 } /* if (ms) */
413 /* draw the relief */
414 - RelieveRectangle(dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1,
415 - MR_HEIGHT(mr) - 1, (Pdepth < 2) ?
416 - SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) :
417 - HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)),
418 - SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)), bw);
419 + if (!(ms && ST_FACE(ms).type == MultiPixmapMenu))
420 + {
421 + RelieveRectangle(dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1,
422 + MR_HEIGHT(mr) - 1, (Pdepth < 2) ?
423 + SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) :
424 + HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)),
425 + SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)), bw);
426 + }
427 /* paint the menu items */
428 for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi))
429 {
430 diff -U3 -r fvwm/menustyle.c fvwm/menustyle.c
431 --- fvwm/menustyle.c 2011-12-09 20:59:40.677503490 +0100
432 +++ fvwm/menustyle.c 2011-12-09 21:31:27.175197468 +0100
433 @@ -160,6 +160,8 @@
434 char *token;
435 char *action = s;
436 FvwmPictureAttributes fpa;
437 + FvwmPicture **pm;
438 + int x, y;
439
440 s = GetNextToken(s, &style);
441 if (style && strncasecmp(style, "--", 2) == 0)
442 @@ -271,6 +273,58 @@
443 return False;
444 }
445 }
446 + else if (StrEquals(style,"MultiBorder"))
447 + {
448 + fpa.mask = (Pdepth <= 8)? FPAM_DITHER:0;
449 + pm = mf->u.mb.pixmaps;
450 +
451 + for (x = 0; x < 8; x++)
452 + {
453 + if (pm[x])
454 + {
455 + PDestroyFvwmPicture(dpy, pm[x]);
456 + }
457 + s = GetNextToken(s, &token);
458 + if (token)
459 + {
460 + pm[x] = PCacheFvwmPicture(dpy, Scr.NoFocusWin, NULL, token, fpa);
461 + if (!pm[x])
462 + {
463 + fvwm_msg(ERR,
464 + "menustyle_parse_face", "Pixmap '%s' could not be loaded",
465 + token);
466 + }
467 + }
468 + else
469 + {
470 + fvwm_msg(ERR,
471 + "menustyle_parse_face", "Too few parameters for MultiBorder");
472 + }
473 + if (!token || !pm[x])
474 + {
475 + for (y = 0; y < x; y++)
476 + {
477 + if (pm[y])
478 + {
479 + PDestroyFvwmPicture(dpy, pm[y]);
480 + pm[y] = 0;
481 + }
482 + }
483 + free(style);
484 + if (token)
485 + {
486 + free(token);
487 + }
488 + if (mf->type == MultiPixmapMenu)
489 + {
490 + mf->type = SimpleMenu;
491 + }
492 + return False;
493 + }
494 + mf->type = MultiPixmapMenu;
495 + free(token);
496 + }
497 + }
498 else
499 {
500 if (verbose)
501 diff -U3 -r fvwm/menustyle.h fvwm/menustyle.h
502 --- fvwm/menustyle.h 2011-12-09 20:59:40.677503490 +0100
503 +++ fvwm/menustyle.h 2011-12-09 21:31:27.175197468 +0100
504 @@ -195,6 +195,7 @@
505 GradientMenu,
506 PixmapMenu,
507 TiledPixmapMenu,
508 + MultiPixmapMenu,
509 SolidMenu
510 /* max button is 8 (0x8) */
511 } MenuFaceType;
512 @@ -245,6 +246,9 @@
513 {
514 union
515 {
516 + struct {
517 + FvwmPicture *pixmaps[8];
518 + } mb;
519 FvwmPicture *p;
520 Pixel back;
521 struct
522 diff -U3 -r fvwm/screen.h fvwm/screen.h
523 --- fvwm/screen.h 2011-12-09 21:12:03.205196181 +0100
524 +++ fvwm/screen.h 2011-12-09 21:31:27.175197468 +0100
525 @@ -99,6 +99,7 @@
526 AdjustedPixmapButton,
527 ShrunkPixmapButton,
528 MultiPixmap,
529 + MultiBorder,
530 MiniIconButton,
531 SolidButton,
532 ColorsetButton
533 @@ -158,6 +159,9 @@
534 Pixel *pixels;
535 unsigned short solid_flags;
536 } mp;
537 + struct {
538 + FvwmPicture *pixmaps[8];
539 + } mb;
540 struct
541 {
542 int cs;
AUR mirror