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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.389 by root, Sun Feb 17 00:52:04 2013 UTC vs.
Revision 1.397 by root, Sat Dec 13 12:24:32 2014 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
254 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
256 { 256 {
257 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
258#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
259 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
260#endif 261#endif
261 } 262 }
262 263
263 clear (); 264 clear ();
264 265
… …
277 free (locale); 278 free (locale);
278 free (v_buffer); 279 free (v_buffer);
279 280
280 delete selection_req; 281 delete selection_req;
281 282
283 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
284 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
285
286 delete env;
287
282 delete envv; 288 delete envv;
283 delete argv; 289 delete argv;
284 290
285#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
286 delete keyboard; 292 delete keyboard;
287#endif 293#endif
288#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
289 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
290#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
291} 299}
292 300
293// child has exited, usually destroys 301// child has exited, usually destroys
294void 302void
295rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
383 391
384#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
385static void ecb_cold 393static void ecb_cold
386print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
387{ 395{
388 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
389 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
390 char number[32]; 398 char number[32];
391 399
392 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
393 401
394 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); 402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); 403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
396 404
397 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); 405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
398 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
399 rxvt_warn ("+ %s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
400 408
401 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); 410 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
403 411
404 if (event->request_code >= 128) 412 if (event->request_code >= 128)
405 { 413 {
406#if 0 414#if 0
407 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ 415 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
408 int nexts; 416 int nexts;
409 char **exts = XListExtensions (dpy, &nexts); 417 char **exts = XListExtensions (dpy, &nexts);
410 418
411 while (nexts) 419 while (nexts)
412 { 420 {
413 char *extname = exts [nexts - 1]; 421 char *extname = exts [nexts - 1];
414 int major, first_event, first_error; 422 int major, first_event, first_error;
415 423
416 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) 424 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
417 { 425 {
418 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
419 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); 427 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
420 428
421 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); 429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
422 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); 430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
423 rxvt_warn ("+ (which is %s)\n", buffer); 431 rxvt_warn ("+ (which is %s)\n", buffer);
424 432
425 break; 433 break;
426 } 434 }
427 435
428 printf ("nextss %d %s\n", nexts, extname);//D 436 printf ("nextss %d %s\n", nexts, extname);//D
429 --nexts; 437 --nexts;
430 ++exts; 438 ++exts;
431 } 439 }
432#else 440#else
433 int nexts = 0; 441 int nexts = 0;
434 char **exts = 0; 442 char **exts = 0;
435#endif 443#endif
436 444
437 if (!nexts) 445 if (!nexts)
438 { 446 {
439 rxvt_warn ("+ (which is an unknown extension)\n", buffer); 447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
440 448
441 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
442 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); 450 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
443 451
444#if 0 452#if 0
445 sprintf (number, "RENDER.%d", event->minor_code); 453 sprintf (number, "RENDER.%d", event->minor_code);
446 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
447 rxvt_warn ("+ (which is %s)\n", buffer); 455 rxvt_warn ("+ (which is %s)\n", buffer);
448#endif 456#endif
449 } 457 }
450 458
451 XFreeExtensionList (exts); 459 XFreeExtensionList (exts);
452 } 460 }
453 else 461 else
454 { 462 {
455 sprintf (number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
456 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
457 rxvt_warn ("+ (which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
458 } 466 }
459 467
460 if (event->error_code == BadWindow 468 if (event->error_code == BadWindow
461 || event->error_code == BadPixmap 469 || event->error_code == BadPixmap
462 || event->error_code == BadCursor 470 || event->error_code == BadCursor
463 || event->error_code == BadFont 471 || event->error_code == BadFont
464 || event->error_code == BadDrawable 472 || event->error_code == BadDrawable
465 || event->error_code == BadColor 473 || event->error_code == BadColor
466 || event->error_code == BadGC 474 || event->error_code == BadGC
467 || event->error_code == BadIDChoice 475 || event->error_code == BadIDChoice
468 || event->error_code == BadValue 476 || event->error_code == BadValue
469 || event->error_code == BadAtom) 477 || event->error_code == BadAtom)
470 { 478 {
471 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
472 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
473 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
474 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
475 else 483 else
476 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
477 485
478 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
479 } 487 }
480} 488}
481#endif 489#endif
482 490
483int ecb_cold 491int ecb_cold
484rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
485{ 493{
486 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
487 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
488 else 496 else
489 { 497 {
490 // GET_R is most likely not the terminal which caused the error, 498 // GET_R is most likely not the terminal which caused the error,
491 // so just output the error and continue 499 // so just output the error and continue
… …
934 942
935void 943void
936rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
937{ 945{
938#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
939 rxvt_color xcol;
940
941 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
942 return; 948 return;
943 949
944 color = strdup (color); 950 color = strdup (color);
945 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
… …
951 int i = atoi (color); 957 int i = atoi (color);
952 958
953 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
954 { 960 {
955 /* bright colors */ 961 /* bright colors */
956 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 962 alias_color (idx, minBrightCOLOR + i - 8);
957 goto done; 963 goto done;
958 } 964 }
959 965
960 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
961 { 967 {
962 /* normal colors */ 968 /* normal colors */
963 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
964 goto done; 970 goto done;
965 } 971 }
966 } 972 }
967 973
968 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
969 975 set_color (pix_colors_focused[idx], color);
970 /*
971 * FIXME: should free colors here, but no idea how to do it so instead,
972 * so just keep gobbling up the colormap
973 */
974
975 pix_colors_focused[idx] = xcol;
976 976
977done: 977done:
978 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
979 979
980 update_fade_color (idx); 980 update_fade_color (idx);
981 recolour_cursor (); 981 recolor_cursor ();
982 scr_recolour (); 982 scr_recolor ();
983#endif /* XTERM_COLOR_CHANGE */ 983#endif /* XTERM_COLOR_CHANGE */
984} 984}
985 985
986void 986void
987rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
988{ 988{
989 XColor fg, bg; 989 XColor fg, bg;
990 990
991 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
992 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
… …
1047} 1047}
1048 1048
1049void 1049void
1050rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
1051{ 1051{
1052 pix_colors[dst].free (this);
1052 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1053 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1053} 1054}
1054 1055
1055/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
1056 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
… …
1370 unsigned long fg, bg; 1371 unsigned long fg, bg;
1371 const char *p; 1372 const char *p;
1372 char **s; 1373 char **s;
1373 XIMStyles *xim_styles; 1374 XIMStyles *xim_styles;
1374 1375
1375 set_environ (envv); 1376 set_environ (env);
1376 1377
1377 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1378 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1378 return false; 1379 return false;
1379 1380
1380 input_method = display->get_xim (locale, modifiers); 1381 input_method = display->get_xim (locale, modifiers);

Diff Legend

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