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.391 by sf-exg, Mon Oct 6 11:11:19 2014 UTC

… …
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2010 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#ifdef 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),
179#endif 179#endif
180#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
182#endif 182#endif
… …
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#ifdef 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++)
… …
270 free (locale); 277 free (locale);
271 free (v_buffer); 278 free (v_buffer);
272 279
273 delete selection_req; 280 delete selection_req;
274 281
282 if (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
285 delete env;
286
275 delete envv; 287 delete envv;
276 delete argv; 288 delete argv;
277 289
278#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
279 delete keyboard; 291 delete keyboard;
… …
311 { 323 {
312#if USE_XIM 324#if USE_XIM
313 im_ev.stop (display); 325 im_ev.stop (display);
314#endif 326#endif
315 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
316#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
317 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
318#endif 330#endif
319 termwin_ev.stop (display); 331 termwin_ev.stop (display);
320 vt_ev.stop (display); 332 vt_ev.stop (display);
321 } 333 }
… …
362} 374}
363 375
364/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
365/* 377/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * 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 */ 379 */
369static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
370 381
371static void 382static void
372rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
380print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
381{ 392{
382 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
384 char number[32]; 395 char number[32];
385 const char mtype[] = "XlibMessage"; 396
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"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
392 sprintf(number, "%d", event->request_code); 408
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer);
395 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
410 {
411#if 0
412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 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);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397 mesg, BUFSIZ); 447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
399 } 457 }
458 else
459 {
460 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer);
463 }
464
400 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 468 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 470 || event->error_code == BadColor
406 (event->error_code == BadGC) || 471 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 473 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
410 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 480 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ); 482
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
420 } 484 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 485}
425#endif 486#endif
426 487
427int ecb_cold 488int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
572 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
573 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
574 635
575 XrmInitialize (); 636 XrmInitialize ();
576 637
577#ifdef HAVE_PIXBUF 638#if HAVE_PIXBUF
578 g_type_init (); 639 g_type_init ();
579#endif 640#endif
580} 641}
581 642
582/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
… …
768 829
769 delete fontset[0]; 830 delete fontset[0];
770 fontset[0] = fs; 831 fontset[0] = fs;
771 832
772 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
773 prop.width += letterSpace; 834 prop.width = max (prop.width + letterSpace, 1);
774 835
775 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
776 837
777 fwidth = prop.width; 838 fwidth = prop.width;
778 fheight = prop.height + lineSpace; 839 fheight = prop.height + lineSpace;
… …
965 1026
966 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
967 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
968 { 1029 {
969 sprintf (bstr, "%d", i - Color_Black); 1030 sprintf (bstr, "%d", i - Color_Black);
970#ifdef BG_IMAGE_FROM_FILE 1031#if BG_IMAGE_FROM_FILE
971 xpmb = "default;"; 1032 xpmb = "default;";
972#endif 1033#endif
973 break; 1034 break;
974 } 1035 }
975 1036
… …
1078 1139
1079 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
1080 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1081 vt_width, vt_height); 1142 vt_width, vt_height);
1082 1143
1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1145
1083#ifdef HAVE_BG_PIXMAP 1146#ifdef HAVE_BG_PIXMAP
1084 if (bg_window_size_sensitive ()) 1147 if (bg_window_size_sensitive ())
1085 update_background (); 1148 update_background ();
1086#endif 1149#endif
1087 } 1150 }
1088 1151
1089 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
1090 scr_reset (); 1153 scr_reset ();
1091 1154
1092#ifdef USE_XIM 1155#if USE_XIM
1093 im_set_position (); 1156 im_set_position ();
1094#endif 1157#endif
1095} 1158}
1096 1159
1097/* 1160/*
… …
1122} 1185}
1123 1186
1124/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1125 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1126 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1127#ifdef USE_XIM 1190#if USE_XIM
1128 1191
1129void 1192void
1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1131{ 1194{
1132 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1312 unsigned long fg, bg; 1375 unsigned long fg, bg;
1313 const char *p; 1376 const char *p;
1314 char **s; 1377 char **s;
1315 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1316 1379
1317 set_environ (envv); 1380 set_environ (env);
1318 1381
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1383 return false;
1321 1384
1322 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1323 if (input_method == NULL) 1386 if (input_method == NULL)
1324 return false; 1387 return false;
… …
1632rxvt_term::update_background () 1695rxvt_term::update_background ()
1633{ 1696{
1634 if (update_background_ev.is_active ()) 1697 if (update_background_ev.is_active ())
1635 return; 1698 return;
1636 1699
1637 bg_invalidate ();
1638
1639 if (!mapped)
1640 return;
1641
1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1643 1701
1644 if (to_wait <= 0.) 1702 if (to_wait <= 0.)
1645 bg_render (); 1703 bg_render ();
1646 else 1704 else

Diff Legend

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