ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs.
Revision 1.211 by ayin, Sun Sep 9 10:14:40 2007 UTC

… …
265/*----------------------------------------------------------------------*/ 265/*----------------------------------------------------------------------*/
266const char ** 266const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 267rxvt_term::init_resources (int argc, const char *const *argv)
268{ 268{
269 int i, r_argc; 269 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
272 271
273 /* 272 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 274 */
… …
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295 294
296 cmd_argv[i] = NULL; 295 cmd_argv[i] = NULL;
297 } 296 }
298 297
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 298 rs[Rs_name] = rxvt_basename (argv[0]);
300 299
301 /* 300 /*
302 * Open display, get options/resources and create the window 301 * Open display, get options/resources and create the window
303 */ 302 */
304 303
… …
347 * set any defaults not already set 346 * set any defaults not already set
348 */ 347 */
349 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
350 { 349 {
351 if (!rs[Rs_title]) 350 if (!rs[Rs_title])
352 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 351 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
353 if (!rs[Rs_iconName]) 352 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_title]; 353 rs[Rs_iconName] = rs[Rs_title];
355 } 354 }
356 else 355 else
357 { 356 {
… …
395 rs[Rs_cutchars] = CUTCHARS; 394 rs[Rs_cutchars] = CUTCHARS;
396 395
397#ifndef NO_BACKSPACE_KEY 396#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 397 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 398# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 399 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 400# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 401 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 402# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 key_backspace = val;
408 }
409#endif 403#endif
410 404
411#ifndef NO_DELETE_KEY 405#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 406 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 407# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 408 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 409# else
416 key_delete = "\033[3~"; 410 rs[Rs_delete_key] = "\033[3~";
417# endif 411# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 key_delete = val;
422 }
423#endif 412#endif
424 413
425#ifdef HAVE_SCROLLBARS 414#ifdef HAVE_SCROLLBARS
426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
427#endif 416#endif
… …
638 priv_modes |= PrivMode_Keypress; 627 priv_modes |= PrivMode_Keypress;
639 if (!option (Opt_jumpScroll)) 628 if (!option (Opt_jumpScroll))
640 priv_modes |= PrivMode_smoothScroll; 629 priv_modes |= PrivMode_smoothScroll;
641 630
642#ifndef NO_BACKSPACE_KEY 631#ifndef NO_BACKSPACE_KEY
643 if (strcmp (key_backspace, "DEC") == 0) 632 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
644 priv_modes |= PrivMode_HaveBackSpace; 633 priv_modes |= PrivMode_HaveBackSpace;
645#endif 634#endif
646 635
647 /* add value for scrollBar */ 636 /* add value for scrollBar */
648 if (scrollBar.state) 637 if (scrollBar.state)
… …
1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1240 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1252 1241
1253 int er; 1242 int er;
1254 1243
1255#ifndef NO_BACKSPACE_KEY 1244#ifndef NO_BACKSPACE_KEY
1256 if (key_backspace[0] && !key_backspace[1]) 1245 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1257 er = key_backspace[0]; 1246 er = rs[Rs_backspace_key][0];
1258 else if (strcmp (key_backspace, "DEC") == 0) 1247 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1259 er = '\177'; /* the initial state anyway */ 1248 er = '\177'; /* the initial state anyway */
1260 else 1249 else
1261#endif 1250#endif
1262 er = -1; 1251 er = -1;
1263 1252
… …
1386 const char *argv0, *shell; 1375 const char *argv0, *shell;
1387 1376
1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1389 shell = "/bin/sh"; 1378 shell = "/bin/sh";
1390 1379
1391 argv0 = (const char *)rxvt_r_basename (shell); 1380 argv0 = (const char *)rxvt_basename (shell);
1392 1381
1393 if (option (Opt_loginShell)) 1382 if (option (Opt_loginShell))
1394 { 1383 {
1395 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1384 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1396 1385

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines