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.380 by root, Tue Jun 5 11:35:58 2012 UTC vs.
Revision 1.395 by root, Sat Dec 13 11:58:23 2014 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 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("+ (which is %s)\n", buffer);
400
401 if (event->request_code >= 128) 412 if (event->request_code >= 128)
413 {
414#if 0
415 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
416 int nexts;
417 char **exts = XListExtensions (dpy, &nexts);
418
419 while (nexts)
402 { 420 {
421 char *extname = exts [nexts - 1];
422 int major, first_event, first_error;
423
424 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
425 {
426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
427 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
428
429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
431 rxvt_warn ("+ (which is %s)\n", buffer);
432
433 break;
434 }
435
436 printf ("nextss %d %s\n", nexts, extname);//D
437 --nexts;
438 ++exts;
439 }
440#else
441 int nexts = 0;
442 char **exts = 0;
443#endif
444
445 if (!nexts)
446 {
447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
448
403 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
404 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);
451
452#if 0
453 sprintf (number, "RENDER.%d", event->minor_code);
454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
455 rxvt_warn ("+ (which is %s)\n", buffer);
456#endif
405 } 457 }
406 458
459 XFreeExtensionList (exts);
460 }
461 else
462 {
463 sprintf (number, "%d", event->request_code);
464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
465 rxvt_warn ("+ (which is %s)\n", buffer);
466 }
467
407 if (event->error_code == BadWindow 468 if (event->error_code == BadWindow
408 || event->error_code == BadPixmap 469 || event->error_code == BadPixmap
409 || event->error_code == BadCursor 470 || event->error_code == BadCursor
410 || event->error_code == BadFont 471 || event->error_code == BadFont
411 || event->error_code == BadDrawable 472 || event->error_code == BadDrawable
412 || event->error_code == BadColor 473 || event->error_code == BadColor
413 || event->error_code == BadGC 474 || event->error_code == BadGC
414 || event->error_code == BadIDChoice 475 || event->error_code == BadIDChoice
415 || event->error_code == BadValue 476 || event->error_code == BadValue
416 || event->error_code == BadAtom) 477 || event->error_code == BadAtom)
417 { 478 {
418 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
419 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
420 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
421 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
422 else 483 else
423 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
424 485
425 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
426 } 487 }
427} 488}
428#endif 489#endif
429 490
430int ecb_cold 491int ecb_cold
431rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
432{ 493{
433 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
434 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
435 else 496 else
436 { 497 {
437 // 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,
438 // so just output the error and continue 499 // so just output the error and continue
… …
771 832
772 delete fontset[0]; 833 delete fontset[0];
773 fontset[0] = fs; 834 fontset[0] = fs;
774 835
775 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
776 prop.width += letterSpace; 837 prop.width = max (prop.width + letterSpace, 1);
777 838
778 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
779 840
780 fwidth = prop.width; 841 fwidth = prop.width;
781 fheight = prop.height + lineSpace; 842 fheight = prop.height + lineSpace;
… …
1317 unsigned long fg, bg; 1378 unsigned long fg, bg;
1318 const char *p; 1379 const char *p;
1319 char **s; 1380 char **s;
1320 XIMStyles *xim_styles; 1381 XIMStyles *xim_styles;
1321 1382
1322 set_environ (envv); 1383 set_environ (env);
1323 1384
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1385 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1386 return false;
1326 1387
1327 input_method = display->get_xim (locale, modifiers); 1388 input_method = display->get_xim (locale, modifiers);
1328 if (input_method == NULL) 1389 if (input_method == NULL)
1329 return false; 1390 return false;
… …
1637rxvt_term::update_background () 1698rxvt_term::update_background ()
1638{ 1699{
1639 if (update_background_ev.is_active ()) 1700 if (update_background_ev.is_active ())
1640 return; 1701 return;
1641 1702
1642 bg_invalidate ();
1643
1644 if (!mapped)
1645 return;
1646
1647 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1703 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1648 1704
1649 if (to_wait <= 0.) 1705 if (to_wait <= 0.)
1650 bg_render (); 1706 bg_render ();
1651 else 1707 else

Diff Legend

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