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.382 by root, Tue Jun 5 12:04:55 2012 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 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
… …
168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169#endif 169#endif
170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif 172#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif 175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#if USE_XIM 177#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
… …
226 226
227#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
228 bg_destroy (); 228 bg_destroy ();
229#endif 229#endif
230 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
231 if (display) 235 if (display)
232 { 236 {
233 selection_clear (); 237 selection_clear ();
234 selection_clear (true); 238 selection_clear (true);
235 239
236#if USE_XIM 240#if USE_XIM
237 im_destroy (); 241 im_destroy ();
238#endif 242#endif
239 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
240 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
241 247
242 delete drawable; 248 delete drawable;
249
243 // destroy all windows 250 // destroy all windows
244 if (parent) 251 if (parent)
245 XDestroyWindow (dpy, parent); 252 XDestroyWindow (dpy, parent);
246 253
247 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
248 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
249 { 256 {
250 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
251#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
252 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
253#endif 261#endif
254 } 262 }
255 263
256 clear (); 264 clear ();
257 265
… …
270 free (locale); 278 free (locale);
271 free (v_buffer); 279 free (v_buffer);
272 280
273 delete selection_req; 281 delete selection_req;
274 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
275 delete envv; 288 delete envv;
276 delete argv; 289 delete argv;
277 290
278#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
279 delete keyboard; 292 delete keyboard;
280#endif 293#endif
281#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
283#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
284} 299}
285 300
286// child has exited, usually destroys 301// child has exited, usually destroys
287void 302void
288rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
311 { 326 {
312#if USE_XIM 327#if USE_XIM
313 im_ev.stop (display); 328 im_ev.stop (display);
314#endif 329#endif
315 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
316#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
317 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
318#endif 333#endif
319 termwin_ev.stop (display); 334 termwin_ev.stop (display);
320 vt_ev.stop (display); 335 vt_ev.stop (display);
321 } 336 }
… …
376 391
377#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
378static void ecb_cold 393static void ecb_cold
379print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
380{ 395{
381 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
383 char number[32]; 398 char number[32];
384 399
385 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");
386 401
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); 402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); 403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389 404
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); 405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
392 rxvt_warn ("+ %s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393 408
394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
395 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);
396 411
397 if (event->request_code >= 128) 412 if (event->request_code >= 128)
398 { 413 {
399#if 0 414#if 0
400 /* 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 */
401 int nexts; 416 int nexts;
402 char **exts = XListExtensions (dpy, &nexts); 417 char **exts = XListExtensions (dpy, &nexts);
403 418
404 while (nexts) 419 while (nexts)
405 { 420 {
406 char *extname = exts [nexts - 1]; 421 char *extname = exts [nexts - 1];
407 int major, first_event, first_error; 422 int major, first_event, first_error;
408 423
409 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)
410 { 425 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 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);
413 428
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); 429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); 430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer); 431 rxvt_warn ("+ (which is %s)\n", buffer);
417 432
418 break; 433 break;
419 } 434 }
420 435
421 printf ("nextss %d %s\n", nexts, extname);//D 436 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts; 437 --nexts;
423 ++exts; 438 ++exts;
424 } 439 }
425#else 440#else
426 int nexts = 0; 441 int nexts = 0;
427 char **exts = 0; 442 char **exts = 0;
428#endif 443#endif
429 444
430 if (!nexts) 445 if (!nexts)
431 { 446 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer); 447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433 448
434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
435 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);
436 451
437#if 0 452#if 0
438 sprintf (number, "RENDER.%d", event->minor_code); 453 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer); 455 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif 456#endif
442 } 457 }
443 458
444 XFreeExtensionList (exts); 459 XFreeExtensionList (exts);
445 } 460 }
446 else 461 else
447 { 462 {
448 sprintf (number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
451 } 466 }
452 467
453 if (event->error_code == BadWindow 468 if (event->error_code == BadWindow
454 || event->error_code == BadPixmap 469 || event->error_code == BadPixmap
455 || event->error_code == BadCursor 470 || event->error_code == BadCursor
456 || event->error_code == BadFont 471 || event->error_code == BadFont
457 || event->error_code == BadDrawable 472 || event->error_code == BadDrawable
458 || event->error_code == BadColor 473 || event->error_code == BadColor
459 || event->error_code == BadGC 474 || event->error_code == BadGC
460 || event->error_code == BadIDChoice 475 || event->error_code == BadIDChoice
461 || event->error_code == BadValue 476 || event->error_code == BadValue
462 || event->error_code == BadAtom) 477 || event->error_code == BadAtom)
463 { 478 {
464 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
466 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
468 else 483 else
469 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
470 485
471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 } 487 }
473} 488}
474#endif 489#endif
475 490
476int ecb_cold 491int ecb_cold
477rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
478{ 493{
479 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
480 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
481 else 496 else
482 { 497 {
483 // 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,
484 // so just output the error and continue 499 // so just output the error and continue
… …
817 832
818 delete fontset[0]; 833 delete fontset[0];
819 fontset[0] = fs; 834 fontset[0] = fs;
820 835
821 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
822 prop.width += letterSpace; 837 prop.width = max (prop.width + letterSpace, 1);
823 838
824 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
825 840
826 fwidth = prop.width; 841 fwidth = prop.width;
827 fheight = prop.height + lineSpace; 842 fheight = prop.height + lineSpace;
… …
927 942
928void 943void
929rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
930{ 945{
931#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
932 rxvt_color xcol;
933
934 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
935 return; 948 return;
936 949
937 color = strdup (color); 950 color = strdup (color);
938 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
… …
944 int i = atoi (color); 957 int i = atoi (color);
945 958
946 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
947 { 960 {
948 /* bright colors */ 961 /* bright colors */
949 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 962 alias_color (idx, minBrightCOLOR + i - 8);
950 goto done; 963 goto done;
951 } 964 }
952 965
953 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
954 { 967 {
955 /* normal colors */ 968 /* normal colors */
956 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
957 goto done; 970 goto done;
958 } 971 }
959 } 972 }
960 973
961 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
962 975 set_color (pix_colors_focused[idx], color);
963 /*
964 * FIXME: should free colors here, but no idea how to do it so instead,
965 * so just keep gobbling up the colormap
966 */
967
968 pix_colors_focused[idx] = xcol;
969 976
970done: 977done:
971 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
972 979
973 update_fade_color (idx); 980 update_fade_color (idx);
974 recolour_cursor (); 981 recolor_cursor ();
975 scr_recolour (); 982 scr_recolor ();
976#endif /* XTERM_COLOR_CHANGE */ 983#endif /* XTERM_COLOR_CHANGE */
977} 984}
978 985
979void 986void
980rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
981{ 988{
982 XColor fg, bg; 989 XColor fg, bg;
983 990
984 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
985 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
… …
1040} 1047}
1041 1048
1042void 1049void
1043rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
1044{ 1051{
1052 pix_colors[dst].free (this);
1045 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]);
1046} 1054}
1047 1055
1048/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
1049 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
… …
1363 unsigned long fg, bg; 1371 unsigned long fg, bg;
1364 const char *p; 1372 const char *p;
1365 char **s; 1373 char **s;
1366 XIMStyles *xim_styles; 1374 XIMStyles *xim_styles;
1367 1375
1368 set_environ (envv); 1376 set_environ (env);
1369 1377
1370 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1378 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1371 return false; 1379 return false;
1372 1380
1373 input_method = display->get_xim (locale, modifiers); 1381 input_method = display->get_xim (locale, modifiers);
1374 if (input_method == NULL) 1382 if (input_method == NULL)
1375 return false; 1383 return false;
… …
1683rxvt_term::update_background () 1691rxvt_term::update_background ()
1684{ 1692{
1685 if (update_background_ev.is_active ()) 1693 if (update_background_ev.is_active ())
1686 return; 1694 return;
1687 1695
1688 bg_invalidate ();
1689
1690 if (!mapped)
1691 return;
1692
1693 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1696 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1694 1697
1695 if (to_wait <= 0.) 1698 if (to_wait <= 0.)
1696 bg_render (); 1699 bg_render ();
1697 else 1700 else

Diff Legend

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