… | |
… | |
303 | } |
303 | } |
304 | |
304 | |
305 | XrmDatabase |
305 | XrmDatabase |
306 | rxvt_display::get_resources (bool refresh) |
306 | rxvt_display::get_resources (bool refresh) |
307 | { |
307 | { |
308 | char *homedir = (char *)getenv ("HOME"); |
308 | char *homedir = getenv ("HOME"); |
309 | char fname[1024]; |
309 | char fname[1024]; |
310 | |
310 | |
311 | /* |
311 | /* |
312 | * get resources using the X library function |
312 | * get resources using the X library function |
313 | */ |
313 | */ |
… | |
… | |
318 | // as opposed to "standard practise", we always read in ~/.Xdefaults |
318 | // as opposed to "standard practise", we always read in ~/.Xdefaults |
319 | |
319 | |
320 | // 6. System wide per application default file. |
320 | // 6. System wide per application default file. |
321 | |
321 | |
322 | /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ |
322 | /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ |
323 | if ((xe = (char *)getenv ("XAPPLRESDIR"))) |
323 | if ((xe = getenv ("XAPPLRESDIR"))) |
324 | { |
324 | { |
325 | snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); |
325 | snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); |
326 | |
326 | |
327 | if ((rdb1 = XrmGetFileDatabase (fname))) |
327 | if ((rdb1 = XrmGetFileDatabase (fname))) |
328 | XrmMergeDatabases (rdb1, &database); |
328 | XrmMergeDatabases (rdb1, &database); |
… | |
… | |
400 | XFree (displayResource); |
400 | XFree (displayResource); |
401 | } |
401 | } |
402 | |
402 | |
403 | // 3. User's per host defaults file |
403 | // 3. User's per host defaults file |
404 | /* Add in XENVIRONMENT file */ |
404 | /* Add in XENVIRONMENT file */ |
405 | if ((xe = (char *)getenv ("XENVIRONMENT")) |
405 | if ((xe = getenv ("XENVIRONMENT")) |
406 | && (rdb1 = XrmGetFileDatabase (xe))) |
406 | && (rdb1 = XrmGetFileDatabase (xe))) |
407 | XrmMergeDatabases (rdb1, &database); |
407 | XrmMergeDatabases (rdb1, &database); |
408 | else if (homedir) |
408 | else if (homedir) |
409 | { |
409 | { |
410 | struct utsname un; |
410 | struct utsname un; |