| … | |
… | |
| 312 | * get resources using the X library function |
312 | * get resources using the X library function |
| 313 | */ |
313 | */ |
| 314 | char *displayResource, *xe; |
314 | char *displayResource, *xe; |
| 315 | XrmDatabase rdb1, database = 0; |
315 | XrmDatabase rdb1, database = 0; |
| 316 | |
316 | |
|
|
317 | #if !XLIB_ILLEGAL_ACCESS |
|
|
318 | /* work around a bug in XrmSetDatabase where it frees the db, see ref_next */ |
|
|
319 | database = XrmGetStringDatabase (""); |
|
|
320 | #endif |
|
|
321 | |
| 317 | // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 |
322 | // 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 |
323 | // as opposed to "standard practise", we always read in ~/.Xdefaults |
| 319 | |
324 | |
| 320 | // 6. System wide per application default file. |
325 | // 6. System wide per application default file. |
| 321 | |
326 | |
| … | |
… | |
| 488 | rxvt_display::ref_next () |
493 | rxvt_display::ref_next () |
| 489 | { |
494 | { |
| 490 | // TODO: somehow check whether the database files/resources changed |
495 | // TODO: somehow check whether the database files/resources changed |
| 491 | // before affording re-loading/parsing |
496 | // before affording re-loading/parsing |
| 492 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
497 | XrmDestroyDatabase (XrmGetDatabase (dpy)); |
|
|
498 | #if XLIB_ILLEGAL_ACCESS |
|
|
499 | /* work around a bug in XrmSetDatabase where it frees the db */ |
|
|
500 | dpy->db = 0; |
|
|
501 | #endif |
| 493 | XrmSetDatabase (dpy, get_resources (true)); |
502 | XrmSetDatabase (dpy, get_resources (true)); |
| 494 | } |
503 | } |
| 495 | |
504 | |
| 496 | rxvt_display::~rxvt_display () |
505 | rxvt_display::~rxvt_display () |
| 497 | { |
506 | { |
