| … | |
… | |
| 259 | int geom_flags = 0, changed = 0; |
259 | int geom_flags = 0, changed = 0; |
| 260 | int x = 0, y = 0; |
260 | int x = 0, y = 0; |
| 261 | unsigned int w = 0, h = 0; |
261 | unsigned int w = 0, h = 0; |
| 262 | unsigned int n; |
262 | unsigned int n; |
| 263 | unsigned long new_flags = (flags & (~geometryFlags)); |
263 | unsigned long new_flags = (flags & (~geometryFlags)); |
| 264 | char *p; |
264 | const char *p; |
| 265 | # define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ |
265 | # define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ |
| 266 | |
266 | |
| 267 | if (geom == NULL) |
267 | if (geom == NULL) |
| 268 | return false; |
268 | return false; |
| 269 | |
269 | |
| … | |
… | |
| 675 | { |
675 | { |
| 676 | # ifdef HAVE_AFTERIMAGE |
676 | # ifdef HAVE_AFTERIMAGE |
| 677 | if (!target->asimman) |
677 | if (!target->asimman) |
| 678 | target->asimman = create_generic_imageman (target->rs[Rs_path]); |
678 | target->asimman = create_generic_imageman (target->rs[Rs_path]); |
| 679 | |
679 | |
| 680 | if (char *f = strchr (file, ';')) |
680 | if (const char *p = strchr (file, ';')) |
| 681 | { |
681 | { |
| 682 | size_t len = f - file; |
682 | size_t len = p - file; |
| 683 | f = (char *)malloc (len + 1); |
683 | char *f = (char *)malloc (len + 1); |
| 684 | memcpy (f, file, len); |
684 | memcpy (f, file, len); |
| 685 | f[len] = '\0'; |
685 | f[len] = '\0'; |
| 686 | original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); |
686 | original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); |
| 687 | free (f); |
687 | free (f); |
| 688 | } |
688 | } |
| … | |
… | |
| 1137 | } |
1137 | } |
| 1138 | # endif |
1138 | # endif |
| 1139 | |
1139 | |
| 1140 | XImage *result = NULL; |
1140 | XImage *result = NULL; |
| 1141 | # ifdef HAVE_AFTERIMAGE |
1141 | # ifdef HAVE_AFTERIMAGE |
| 1142 | target->init_asv (); |
|
|
| 1143 | |
|
|
| 1144 | if (original_asim |
1142 | if (original_asim |
| 1145 | || (background_flags & transpTransformations) != (flags & transpTransformations)) |
1143 | || (background_flags & transpTransformations) != (flags & transpTransformations)) |
| 1146 | { |
1144 | { |
|
|
1145 | target->init_asv (); |
|
|
1146 | |
| 1147 | ASImage *background = NULL; |
1147 | ASImage *background = NULL; |
| 1148 | ARGB32 as_tint = TINT_LEAVE_SAME; |
1148 | ARGB32 as_tint = TINT_LEAVE_SAME; |
| 1149 | if (background_flags) |
1149 | if (background_flags) |
| 1150 | background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); |
1150 | background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); |
| 1151 | |
1151 | |
| … | |
… | |
| 1327 | |
1327 | |
| 1328 | /* don't want Expose on the parent or vt. It is better to use |
1328 | /* don't want Expose on the parent or vt. It is better to use |
| 1329 | scr_touch or we get a great deal of flicker otherwise: */ |
1329 | scr_touch or we get a great deal of flicker otherwise: */ |
| 1330 | XClearWindow (target->dpy, target->parent[0]); |
1330 | XClearWindow (target->dpy, target->parent[0]); |
| 1331 | |
1331 | |
| 1332 | if (target->scrollBar.win) |
1332 | if (target->scrollBar.state && target->scrollBar.win) |
| 1333 | { |
1333 | { |
| 1334 | target->scrollBar.state = STATE_IDLE; |
1334 | target->scrollBar.state = STATE_IDLE; |
| 1335 | target->scrollBar.show (0); |
1335 | target->scrollBar.show (0); |
| 1336 | } |
1336 | } |
| 1337 | |
1337 | |
