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.375 by sf-exg, Sun Jun 3 17:48:28 2012 UTC vs.
Revision 1.399 by sf-exg, Tue Oct 13 08:10:43 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169#endif 170#endif
170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif 173#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif 176#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#ifdef USE_XIM 178#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
179#endif 180#endif
180#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
182#endif 183#endif
… …
226 227
227#ifdef HAVE_BG_PIXMAP 228#ifdef HAVE_BG_PIXMAP
228 bg_destroy (); 229 bg_destroy ();
229#endif 230#endif
230 231
232#if HAVE_IMG
233 delete bg_img;
234#endif
235
231 if (display) 236 if (display)
232 { 237 {
233 selection_clear (); 238 selection_clear ();
234 selection_clear (true); 239 selection_clear (true);
235 240
236#ifdef USE_XIM 241#if USE_XIM
237 im_destroy (); 242 im_destroy ();
238#endif 243#endif
239 scrollBar.destroy (); 244 scrollBar.destroy ();
245
246 if (gc)
240 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
241 248
242 delete drawable; 249 delete drawable;
250
243 // destroy all windows 251 // destroy all windows
244 if (parent) 252 if (parent)
245 XDestroyWindow (dpy, parent); 253 XDestroyWindow (dpy, parent);
246 254
247 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
248 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
249 { 257 {
250 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
251#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
252 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
253#endif 262#endif
254 } 263 }
255 264
256 clear (); 265 clear ();
257 266
… …
270 free (locale); 279 free (locale);
271 free (v_buffer); 280 free (v_buffer);
272 281
273 delete selection_req; 282 delete selection_req;
274 283
284 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
285 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
286
287 delete [] env;
288
275 delete envv; 289 delete envv;
276 delete argv; 290 delete argv;
277 291
278#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
279 delete keyboard; 293 delete keyboard;
280#endif 294#endif
281#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
283#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
284} 300}
285 301
286// child has exited, usually destroys 302// child has exited, usually destroys
287void 303void
288rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
311 { 327 {
312#if USE_XIM 328#if USE_XIM
313 im_ev.stop (display); 329 im_ev.stop (display);
314#endif 330#endif
315 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
316#if ENABLE_TRANSPARENCY || ENABLE_PERL 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
317 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
318#endif 334#endif
319 termwin_ev.stop (display); 335 termwin_ev.stop (display);
320 vt_ev.stop (display); 336 vt_ev.stop (display);
321 } 337 }
… …
362} 378}
363 379
364/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
365/* 381/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
367 * TODO: if debugging, this should free up any known resources if we can
368 */ 383 */
369static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
370 385
371static void 386static void
372rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
377 392
378#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
379static void ecb_cold 394static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
381{ 396{
382 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
384 char number[32]; 399 char number[32];
385 const char mtype[] = "XlibMessage"; 400
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 401 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402
403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
405
406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
412
413 if (event->request_code >= 128)
414 {
415#if 0
416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
417 int nexts;
418 char **exts = XListExtensions (dpy, &nexts);
419
420 while (nexts)
421 {
422 char *extname = exts [nexts - 1];
423 int major, first_event, first_error;
424
425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
426 {
427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
429
430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
432 rxvt_warn ("+ (which is %s)\n", buffer);
433
434 break;
435 }
436
437 printf ("nextss %d %s\n", nexts, extname);//D
438 --nexts;
439 ++exts;
440 }
441#else
442 int nexts = 0;
443 char **exts = 0;
444#endif
445
446 if (!nexts)
447 {
448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
449
450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
452
453#if 0
454 sprintf (number, "RENDER.%d", event->minor_code);
455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
458 }
459
460 XFreeExtensionList (exts);
461 }
462 else
463 {
392 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
395 if (event->request_code >= 128) {
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
397 mesg, BUFSIZ);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
399 } 467 }
468
400 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 472 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 474 || event->error_code == BadColor
406 (event->error_code == BadGC) || 475 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 477 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
410 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 484 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ); 486
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
420 } 488 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 489}
425#endif 490#endif
426 491
427int ecb_cold 492int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 494{
430 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
432 else 497 else
433 { 498 {
434 // GET_R is most likely not the terminal which caused the error, 499 // GET_R is most likely not the terminal which caused the error,
435 // so just output the error and continue 500 // so just output the error and continue
… …
572 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
573 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
574 639
575 XrmInitialize (); 640 XrmInitialize ();
576 641
577#ifdef HAVE_PIXBUF 642#if HAVE_PIXBUF
578 g_type_init (); 643 g_type_init ();
579#endif 644#endif
580} 645}
581 646
582/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
… …
768 833
769 delete fontset[0]; 834 delete fontset[0];
770 fontset[0] = fs; 835 fontset[0] = fs;
771 836
772 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
773 prop.width += letterSpace; 838 prop.width = max (prop.width + letterSpace, 1);
774 839
775 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
776 841
777 fwidth = prop.width; 842 fwidth = prop.width;
778 fheight = prop.height + lineSpace; 843 fheight = prop.height + lineSpace;
… …
878 943
879void 944void
880rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
881{ 946{
882#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
883 rxvt_color xcol;
884
885 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
886 return; 949 return;
887 950
888 color = strdup (color); 951 color = strdup (color);
889 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
… …
895 int i = atoi (color); 958 int i = atoi (color);
896 959
897 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
898 { 961 {
899 /* bright colors */ 962 /* bright colors */
900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
901 goto done; 964 goto done;
902 } 965 }
903 966
904 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
905 { 968 {
906 /* normal colors */ 969 /* normal colors */
907 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
908 goto done; 971 goto done;
909 } 972 }
910 } 973 }
911 974
912 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
913 976 set_color (pix_colors_focused[idx], color);
914 /*
915 * FIXME: should free colors here, but no idea how to do it so instead,
916 * so just keep gobbling up the colormap
917 */
918
919 pix_colors_focused[idx] = xcol;
920 977
921done: 978done:
922 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
923 980
924 update_fade_color (idx); 981 update_fade_color (idx);
925 recolour_cursor (); 982 recolor_cursor ();
926 scr_recolour (); 983 scr_recolor ();
927#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
928} 985}
929 986
930void 987void
931rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
932{ 989{
933 XColor fg, bg; 990 XColor fg, bg;
934 991
935 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
936 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
965 1022
966 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
967 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
968 { 1025 {
969 sprintf (bstr, "%d", i - Color_Black); 1026 sprintf (bstr, "%d", i - Color_Black);
970#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
971 xpmb = "default;"; 1028 xpmb = "default;";
972#endif 1029#endif
973 break; 1030 break;
974 } 1031 }
975 1032
… …
991} 1048}
992 1049
993void 1050void
994rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
995{ 1052{
1053 pix_colors[dst].free (this);
996 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1054 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
997} 1055}
998 1056
999/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
1000 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
… …
1078 1136
1079 XMoveResizeWindow (dpy, vt, 1137 XMoveResizeWindow (dpy, vt,
1080 window_vt_x, window_vt_y, 1138 window_vt_x, window_vt_y,
1081 vt_width, vt_height); 1139 vt_width, vt_height);
1082 1140
1141 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1142
1083#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1084 if (bg_window_size_sensitive ()) 1144 if (bg_window_size_sensitive ())
1085 update_background (); 1145 update_background ();
1086#endif 1146#endif
1087 } 1147 }
1088 1148
1089 if (fix_screen || old_height == 0) 1149 if (fix_screen || old_height == 0)
1090 scr_reset (); 1150 scr_reset ();
1091 1151
1092#ifdef USE_XIM 1152#if USE_XIM
1093 im_set_position (); 1153 im_set_position ();
1094#endif 1154#endif
1095} 1155}
1096 1156
1097/* 1157/*
… …
1122} 1182}
1123 1183
1124/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1125 * - X INPUT METHOD ROUTINES - * 1185 * - X INPUT METHOD ROUTINES - *
1126 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1127#ifdef USE_XIM 1187#if USE_XIM
1128 1188
1129void 1189void
1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1190rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1131{ 1191{
1132 fg = pix_colors [Color_fg]; 1192 fg = pix_colors [Color_fg];
… …
1312 unsigned long fg, bg; 1372 unsigned long fg, bg;
1313 const char *p; 1373 const char *p;
1314 char **s; 1374 char **s;
1315 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1316 1376
1317 set_environ (envv); 1377 set_environ (env);
1318 1378
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1380 return false;
1321 1381
1322 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1323 if (input_method == NULL) 1383 if (input_method == NULL)
1324 return false; 1384 return false;
… …
1632rxvt_term::update_background () 1692rxvt_term::update_background ()
1633{ 1693{
1634 if (update_background_ev.is_active ()) 1694 if (update_background_ev.is_active ())
1635 return; 1695 return;
1636 1696
1637 bg_invalidate ();
1638
1639 if (!mapped)
1640 return;
1641
1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1643 1698
1644 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1645 bg_render (); 1700 bg_render ();
1646 else 1701 else

Diff Legend

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