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.391 by sf-exg, Mon Oct 6 11:11:19 2014 UTC vs.
Revision 1.398 by sf-exg, Tue Sep 8 07:54:58 2015 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 3 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.
… …
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
282 if (memcmp (env, envv->begin (), envv->size () * sizeof (char *))) 283 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n"); 284 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284 285
285 delete env; 286 delete [] env;
286 287
287 delete envv; 288 delete envv;
288 delete argv; 289 delete argv;
289 290
290#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
291 delete keyboard; 292 delete keyboard;
292#endif 293#endif
293#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
294 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
295#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
296} 299}
297 300
298// child has exited, usually destroys 301// child has exited, usually destroys
299void 302void
300rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
388 391
389#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
390static void ecb_cold 393static void ecb_cold
391print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
392{ 395{
393 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
394 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
395 char number[32]; 398 char number[32];
396 399
397 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");
398 401
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); 402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); 403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401 404
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); 405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
404 rxvt_warn ("+ %s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405 408
406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
407 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);
408 411
409 if (event->request_code >= 128) 412 if (event->request_code >= 128)
410 { 413 {
411#if 0 414#if 0
412 /* 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 */
413 int nexts; 416 int nexts;
414 char **exts = XListExtensions (dpy, &nexts); 417 char **exts = XListExtensions (dpy, &nexts);
415 418
416 while (nexts) 419 while (nexts)
417 { 420 {
418 char *extname = exts [nexts - 1]; 421 char *extname = exts [nexts - 1];
419 int major, first_event, first_error; 422 int major, first_event, first_error;
420 423
421 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)
422 { 425 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 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);
425 428
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); 429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); 430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer); 431 rxvt_warn ("+ (which is %s)\n", buffer);
429 432
430 break; 433 break;
431 } 434 }
432 435
433 printf ("nextss %d %s\n", nexts, extname);//D 436 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts; 437 --nexts;
435 ++exts; 438 ++exts;
436 } 439 }
437#else 440#else
438 int nexts = 0; 441 int nexts = 0;
439 char **exts = 0; 442 char **exts = 0;
440#endif 443#endif
441 444
442 if (!nexts) 445 if (!nexts)
443 { 446 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer); 447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445 448
446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
447 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);
448 451
449#if 0 452#if 0
450 sprintf (number, "RENDER.%d", event->minor_code); 453 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer); 455 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif 456#endif
454 } 457 }
455 458
456 XFreeExtensionList (exts); 459 XFreeExtensionList (exts);
457 } 460 }
458 else 461 else
459 { 462 {
460 sprintf (number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
463 } 466 }
464 467
465 if (event->error_code == BadWindow 468 if (event->error_code == BadWindow
466 || event->error_code == BadPixmap 469 || event->error_code == BadPixmap
467 || event->error_code == BadCursor 470 || event->error_code == BadCursor
468 || event->error_code == BadFont 471 || event->error_code == BadFont
469 || event->error_code == BadDrawable 472 || event->error_code == BadDrawable
470 || event->error_code == BadColor 473 || event->error_code == BadColor
471 || event->error_code == BadGC 474 || event->error_code == BadGC
472 || event->error_code == BadIDChoice 475 || event->error_code == BadIDChoice
473 || event->error_code == BadValue 476 || event->error_code == BadValue
474 || event->error_code == BadAtom) 477 || event->error_code == BadAtom)
475 { 478 {
476 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
478 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
480 else 483 else
481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
482 485
483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 } 487 }
485} 488}
486#endif 489#endif
487 490
488int ecb_cold 491int ecb_cold
489rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
490{ 493{
491 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
492 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
493 else 496 else
494 { 497 {
495 // 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,
496 // so just output the error and continue 499 // so just output the error and continue
… …
939 942
940void 943void
941rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
942{ 945{
943#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
944 rxvt_color xcol;
945
946 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
947 return; 948 return;
948 949
949 color = strdup (color); 950 color = strdup (color);
950 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
… …
956 int i = atoi (color); 957 int i = atoi (color);
957 958
958 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
959 { 960 {
960 /* bright colors */ 961 /* bright colors */
961 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 962 alias_color (idx, minBrightCOLOR + i - 8);
962 goto done; 963 goto done;
963 } 964 }
964 965
965 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
966 { 967 {
967 /* normal colors */ 968 /* normal colors */
968 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
969 goto done; 970 goto done;
970 } 971 }
971 } 972 }
972 973
973 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
974 975 set_color (pix_colors_focused[idx], color);
975 /*
976 * FIXME: should free colors here, but no idea how to do it so instead,
977 * so just keep gobbling up the colormap
978 */
979
980 pix_colors_focused[idx] = xcol;
981 976
982done: 977done:
983 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
984 979
985 update_fade_color (idx); 980 update_fade_color (idx);
986 recolour_cursor (); 981 recolor_cursor ();
987 scr_recolour (); 982 scr_recolor ();
988#endif /* XTERM_COLOR_CHANGE */ 983#endif /* XTERM_COLOR_CHANGE */
989} 984}
990 985
991void 986void
992rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
993{ 988{
994 XColor fg, bg; 989 XColor fg, bg;
995 990
996 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
997 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
… …
1052} 1047}
1053 1048
1054void 1049void
1055rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
1056{ 1051{
1052 pix_colors[dst].free (this);
1057 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]);
1058} 1054}
1059 1055
1060/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
1061 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *

Diff Legend

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