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.376 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.393 by root, Sat Dec 13 09:50:43 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#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++)
… …
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 (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
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;
280#endif 292#endif
281#ifndef NO_RESOURCES 293#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db); 294 XrmDestroyDatabase (option_db);
283#endif 295#endif
296
297 SET_R ((rxvt_term *)0);
284} 298}
285 299
286// child has exited, usually destroys 300// child has exited, usually destroys
287void 301void
288rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
311 { 325 {
312#if USE_XIM 326#if USE_XIM
313 im_ev.stop (display); 327 im_ev.stop (display);
314#endif 328#endif
315 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
316#if ENABLE_TRANSPARENCY || ENABLE_PERL 330#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
317 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
318#endif 332#endif
319 termwin_ev.stop (display); 333 termwin_ev.stop (display);
320 vt_ev.stop (display); 334 vt_ev.stop (display);
321 } 335 }
… …
362} 376}
363 377
364/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
365/* 379/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * 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 */ 381 */
369static XErrorHandler old_xerror_handler; 382static XErrorHandler old_xerror_handler;
370 383
371static void 384static void
372rxvt_emergency_cleanup () 385rxvt_emergency_cleanup ()
… …
377 390
378#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
379static void ecb_cold 392static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
381{ 394{
382 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
384 char number[32]; 397 char number[32];
385 const char mtype[] = "XlibMessage"; 398
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"); 399 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
400
401 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
403
404 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 406 rxvt_warn ("+ %s: %s\n", mesg, buffer);
407
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 408 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 409 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410
411 if (event->request_code >= 128)
412 {
413#if 0
414 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
415 int nexts;
416 char **exts = XListExtensions (dpy, &nexts);
417
418 while (nexts)
419 {
420 char *extname = exts [nexts - 1];
421 int major, first_event, first_error;
422
423 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
424 {
425 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
426 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
427
428 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
429 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
430 rxvt_warn ("+ (which is %s)\n", buffer);
431
432 break;
433 }
434
435 printf ("nextss %d %s\n", nexts, extname);//D
436 --nexts;
437 ++exts;
438 }
439#else
440 int nexts = 0;
441 char **exts = 0;
442#endif
443
444 if (!nexts)
445 {
446 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
447
448 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
449 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
450
451#if 0
452 sprintf (number, "RENDER.%d", event->minor_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455#endif
456 }
457
458 XFreeExtensionList (exts);
459 }
460 else
461 {
392 sprintf(number, "%d", event->request_code); 462 sprintf (number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 463 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer); 464 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 } 465 }
466
400 if ((event->error_code == BadWindow) || 467 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 468 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 469 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 470 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 471 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 472 || event->error_code == BadColor
406 (event->error_code == BadGC) || 473 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 474 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 475 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 476 || event->error_code == BadAtom)
477 {
410 if (event->error_code == BadValue) 478 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 480 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 482 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ); 484
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 485 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
420 } 486 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 487}
425#endif 488#endif
426 489
427int ecb_cold 490int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 492{
430 if (GET_R->allowedxerror == -1) 493 if (GET_R && GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 494 GET_R->allowedxerror = event->error_code;
432 else 495 else
433 { 496 {
434 // GET_R is most likely not the terminal which caused the error, 497 // GET_R is most likely not the terminal which caused the error,
435 // so just output the error and continue 498 // so just output the error and continue
… …
768 831
769 delete fontset[0]; 832 delete fontset[0];
770 fontset[0] = fs; 833 fontset[0] = fs;
771 834
772 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 835 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
773 prop.width += letterSpace; 836 prop.width = max (prop.width + letterSpace, 1);
774 837
775 fs->set_prop (prop, false); 838 fs->set_prop (prop, false);
776 839
777 fwidth = prop.width; 840 fwidth = prop.width;
778 fheight = prop.height + lineSpace; 841 fheight = prop.height + lineSpace;
… …
1078 1141
1079 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
1080 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1081 vt_width, vt_height); 1144 vt_width, vt_height);
1082 1145
1146 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1147
1083#ifdef HAVE_BG_PIXMAP 1148#ifdef HAVE_BG_PIXMAP
1084 if (bg_window_size_sensitive ()) 1149 if (bg_window_size_sensitive ())
1085 update_background (); 1150 update_background ();
1086#endif 1151#endif
1087 } 1152 }
… …
1312 unsigned long fg, bg; 1377 unsigned long fg, bg;
1313 const char *p; 1378 const char *p;
1314 char **s; 1379 char **s;
1315 XIMStyles *xim_styles; 1380 XIMStyles *xim_styles;
1316 1381
1317 set_environ (envv); 1382 set_environ (env);
1318 1383
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1385 return false;
1321 1386
1322 input_method = display->get_xim (locale, modifiers); 1387 input_method = display->get_xim (locale, modifiers);
1323 if (input_method == NULL) 1388 if (input_method == NULL)
1324 return false; 1389 return false;
… …
1632rxvt_term::update_background () 1697rxvt_term::update_background ()
1633{ 1698{
1634 if (update_background_ev.is_active ()) 1699 if (update_background_ev.is_active ())
1635 return; 1700 return;
1636 1701
1637 bg_invalidate ();
1638
1639 if (!mapped)
1640 return;
1641
1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1702 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1643 1703
1644 if (to_wait <= 0.) 1704 if (to_wait <= 0.)
1645 bg_render (); 1705 bg_render ();
1646 else 1706 else

Diff Legend

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