| … | |
… | |
| 262 | visual = DefaultVisualOfScreen (screen); |
262 | visual = DefaultVisualOfScreen (screen); |
| 263 | cmap = DefaultColormapOfScreen (screen); |
263 | cmap = DefaultColormapOfScreen (screen); |
| 264 | } |
264 | } |
| 265 | |
265 | |
| 266 | void |
266 | void |
| 267 | rxvt_screen::set (rxvt_display *disp, int bitdepth) |
267 | rxvt_screen::select_visual (int bitdepth) |
| 268 | { |
268 | { |
| 269 | set (disp); |
|
|
| 270 | |
|
|
| 271 | #if XFT |
269 | #if XFT |
| 272 | XVisualInfo vinfo; |
270 | XVisualInfo vinfo; |
| 273 | |
271 | |
| 274 | if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) |
272 | if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) |
| 275 | { |
273 | { |
| 276 | depth = bitdepth; |
274 | depth = bitdepth; |
| 277 | visual = vinfo.visual; |
275 | visual = vinfo.visual; |
| 278 | cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); |
276 | cmap = XCreateColormap (dpy, display->root, visual, AllocNone); |
| 279 | } |
277 | } |
| 280 | #endif |
278 | #endif |
| 281 | } |
279 | } |
| 282 | |
280 | |
| 283 | void |
281 | void |
| … | |
… | |
| 315 | */ |
313 | */ |
| 316 | char *displayResource, *xe; |
314 | char *displayResource, *xe; |
| 317 | XrmDatabase rdb1, database = 0; |
315 | XrmDatabase rdb1, database = 0; |
| 318 | |
316 | |
| 319 | // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 |
317 | // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 |
|
|
318 | // as opposed to "standard practise", we always read in ~/.Xdefaults |
| 320 | |
319 | |
| 321 | // 6. System wide per application default file. |
320 | // 6. System wide per application default file. |
| 322 | |
321 | |
| 323 | /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ |
322 | /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ |
| 324 | if ((xe = (char *)getenv ("XAPPLRESDIR"))) |
323 | if ((xe = (char *)getenv ("XAPPLRESDIR"))) |
| … | |
… | |
| 331 | |
330 | |
| 332 | // 5. User's per application default file. |
331 | // 5. User's per application default file. |
| 333 | // none |
332 | // none |
| 334 | |
333 | |
| 335 | // 4. User's defaults file. |
334 | // 4. User's defaults file. |
|
|
335 | if (homedir) |
|
|
336 | { |
|
|
337 | snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir); |
|
|
338 | |
|
|
339 | if ((rdb1 = XrmGetFileDatabase (fname))) |
|
|
340 | XrmMergeDatabases (rdb1, &database); |
|
|
341 | } |
|
|
342 | |
| 336 | /* Get any Xserver defaults */ |
343 | /* Get any Xserver defaults */ |
| 337 | if (refresh) |
344 | if (refresh) |
| 338 | { |
345 | { |
| 339 | // fucking xlib keeps a copy of the rm string |
346 | // fucking xlib keeps a copy of the rm string |
| 340 | Atom actual_type; |
347 | Atom actual_type; |
| … | |
… | |
| 356 | && actual_format == 8) |
363 | && actual_format == 8) |
| 357 | displayResource = val; |
364 | displayResource = val; |
| 358 | else |
365 | else |
| 359 | { |
366 | { |
| 360 | displayResource = 0; |
367 | displayResource = 0; |
|
|
368 | |
| 361 | if (val) |
369 | if (val) |
| 362 | XFree(val); |
370 | XFree(val); |
| 363 | } |
371 | } |
| 364 | |
372 | |
| 365 | #if XLIB_ILLEGAL_ACCESS |
373 | #if XLIB_ILLEGAL_ACCESS |
| … | |
… | |
| 370 | displayResource = XResourceManagerString (dpy); |
378 | displayResource = XResourceManagerString (dpy); |
| 371 | |
379 | |
| 372 | if (displayResource) |
380 | if (displayResource) |
| 373 | { |
381 | { |
| 374 | if ((rdb1 = XrmGetStringDatabase (displayResource))) |
382 | if ((rdb1 = XrmGetStringDatabase (displayResource))) |
| 375 | XrmMergeDatabases (rdb1, &database); |
|
|
| 376 | } |
|
|
| 377 | else if (homedir) |
|
|
| 378 | { |
|
|
| 379 | snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir); |
|
|
| 380 | |
|
|
| 381 | if ((rdb1 = XrmGetFileDatabase (fname))) |
|
|
| 382 | XrmMergeDatabases (rdb1, &database); |
383 | XrmMergeDatabases (rdb1, &database); |
| 383 | } |
384 | } |
| 384 | |
385 | |
| 385 | #if !XLIB_ILLEGAL_ACCESS |
386 | #if !XLIB_ILLEGAL_ACCESS |
| 386 | if (refresh && displayResource) |
387 | if (refresh && displayResource) |
| … | |
… | |
| 578 | XFlush (dpy); |
579 | XFlush (dpy); |
| 579 | } |
580 | } |
| 580 | |
581 | |
| 581 | void rxvt_display::reg (xevent_watcher *w) |
582 | void rxvt_display::reg (xevent_watcher *w) |
| 582 | { |
583 | { |
|
|
584 | if (!w->active) |
|
|
585 | { |
| 583 | xw.push_back (w); |
586 | xw.push_back (w); |
| 584 | w->active = xw.size (); |
587 | w->active = xw.size (); |
|
|
588 | } |
| 585 | } |
589 | } |
| 586 | |
590 | |
| 587 | void rxvt_display::unreg (xevent_watcher *w) |
591 | void rxvt_display::unreg (xevent_watcher *w) |
| 588 | { |
592 | { |
| 589 | if (w->active) |
593 | if (w->active) |
|
|
594 | { |
| 590 | xw[w->active - 1] = 0; |
595 | xw[w->active - 1] = 0; |
|
|
596 | w->active = 0; |
|
|
597 | } |
| 591 | } |
598 | } |
| 592 | |
599 | |
| 593 | void rxvt_display::set_selection_owner (rxvt_term *owner) |
600 | void rxvt_display::set_selection_owner (rxvt_term *owner) |
| 594 | { |
601 | { |
| 595 | if (selection_owner && selection_owner != owner) |
602 | if (selection_owner && selection_owner != owner) |
