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.378 by root, Tue Jun 5 11:10:50 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#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 (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
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);
386 401
387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); 402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
390 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
393 sprintf (number, "%d", event->request_code);
394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
395 rxvt_warn ("(which is %s)\n", buffer);
396 408
397 if (event->request_code >= 128) 409 if (event->request_code >= 128)
398 { 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
399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, 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);
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);
401 } 463 }
402 464
403 if (event->error_code == BadWindow 465 if (event->error_code == BadWindow
404 || event->error_code == BadPixmap 466 || event->error_code == BadPixmap
405 || event->error_code == BadCursor 467 || event->error_code == BadCursor
… …
410 || event->error_code == BadIDChoice 472 || event->error_code == BadIDChoice
411 || event->error_code == BadValue 473 || event->error_code == BadValue
412 || event->error_code == BadAtom) 474 || event->error_code == BadAtom)
413 { 475 {
414 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ); 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
416 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
418 else 480 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 482
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
422 } 484 }
423
424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426} 485}
427#endif 486#endif
428 487
429int ecb_cold 488int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
770 829
771 delete fontset[0]; 830 delete fontset[0];
772 fontset[0] = fs; 831 fontset[0] = fs;
773 832
774 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
775 prop.width += letterSpace; 834 prop.width = max (prop.width + letterSpace, 1);
776 835
777 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
778 837
779 fwidth = prop.width; 838 fwidth = prop.width;
780 fheight = prop.height + lineSpace; 839 fheight = prop.height + lineSpace;
… …
1316 unsigned long fg, bg; 1375 unsigned long fg, bg;
1317 const char *p; 1376 const char *p;
1318 char **s; 1377 char **s;
1319 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1320 1379
1321 set_environ (envv); 1380 set_environ (env);
1322 1381
1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1324 return false; 1383 return false;
1325 1384
1326 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1327 if (input_method == NULL) 1386 if (input_method == NULL)
1328 return false; 1387 return false;
… …
1636rxvt_term::update_background () 1695rxvt_term::update_background ()
1637{ 1696{
1638 if (update_background_ev.is_active ()) 1697 if (update_background_ev.is_active ())
1639 return; 1698 return;
1640 1699
1641 bg_invalidate ();
1642
1643 if (!mapped)
1644 return;
1645
1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1647 1701
1648 if (to_wait <= 0.) 1702 if (to_wait <= 0.)
1649 bg_render (); 1703 bg_render ();
1650 else 1704 else

Diff Legend

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