| … | |
… | |
| 353 | |
353 | |
| 354 | assert (file != NULL); |
354 | assert (file != NULL); |
| 355 | |
355 | |
| 356 | if (bgPixmap.pixmap != None) |
356 | if (bgPixmap.pixmap != None) |
| 357 | { |
357 | { |
| 358 | XFreePixmap (display->display, bgPixmap.pixmap); |
358 | XFreePixmap (xdisp, bgPixmap.pixmap); |
| 359 | bgPixmap.pixmap = None; |
359 | bgPixmap.pixmap = None; |
| 360 | } |
360 | } |
| 361 | |
361 | |
| 362 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
362 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
| 363 | |
363 | |
| 364 | if (*file != '\0') |
364 | if (*file != '\0') |
| 365 | { |
365 | { |
| 366 | /* XWindowAttributes attr; */ |
366 | /* XWindowAttributes attr; */ |
| 367 | |
367 | |
| 368 | /* |
368 | /* |
| 369 | * we already have the required attributes |
369 | * we already have the required attributes |
| 370 | */ |
370 | */ |
| 371 | /* XGetWindowAttributes (display->display, vt, &attr); */ |
371 | /* XGetWindowAttributes (xdisp, vt, &attr); */ |
| 372 | |
372 | |
| 373 | xpmAttr.closeness = 30000; |
373 | xpmAttr.closeness = 30000; |
| 374 | xpmAttr.colormap = cmap; |
374 | xpmAttr.colormap = cmap; |
| 375 | xpmAttr.visual = visual; |
375 | xpmAttr.visual = visual; |
| 376 | xpmAttr.depth = depth; |
376 | xpmAttr.depth = depth; |
| … | |
… | |
| 378 | | XpmDepth | XpmSize | XpmReturnPixels); |
378 | | XpmDepth | XpmSize | XpmReturnPixels); |
| 379 | |
379 | |
| 380 | /* search environment variables here too */ |
380 | /* search environment variables here too */ |
| 381 | f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); |
381 | f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); |
| 382 | if (f == NULL |
382 | if (f == NULL |
| 383 | || XpmReadFileToPixmap (display->display, display->root, f, |
383 | || XpmReadFileToPixmap (xdisp, display->root, f, |
| 384 | &bgPixmap.pixmap, NULL, |
384 | &bgPixmap.pixmap, NULL, |
| 385 | &xpmAttr)) |
385 | &xpmAttr)) |
| 386 | { |
386 | { |
| 387 | char *p; |
387 | char *p; |
| 388 | |
388 | |
