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.381 by root, Tue Jun 5 12:04:33 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#if 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),
… …
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#if 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 }
… …
376 392
377#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
378static void ecb_cold 394static void ecb_cold
379print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
380{ 396{
381 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
383 char number[32]; 399 char number[32];
384 400
385 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");
386 402
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); 403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389 405
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); 406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); 407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
392 rxvt_warn ("+ %s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393 409
394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396 412
397 if (event->request_code >= 128) 413 if (event->request_code >= 128)
398 { 414 {
399#if 0 415#if 0
400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ 416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts; 417 int nexts;
402 char **exts = XListExtensions (dpy, &nexts); 418 char **exts = XListExtensions (dpy, &nexts);
403 419
404 while (nexts) 420 while (nexts)
405 { 421 {
406 char *extname = exts [nexts - 1]; 422 char *extname = exts [nexts - 1];
407 int major, first_event, first_error; 423 int major, first_event, first_error;
408 424
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) 425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 { 426 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); 428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413 429
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); 430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); 431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer); 432 rxvt_warn ("+ (which is %s)\n", buffer);
417 433
418 break; 434 break;
419 } 435 }
420 436
421 printf ("nextss %d %s\n", nexts, extname);//D 437 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts; 438 --nexts;
423 ++exts; 439 ++exts;
424 } 440 }
425#else 441#else
426 int nexts = 0; 442 int nexts = 0;
427 char **exts = 0; 443 char **exts = 0;
428#endif 444#endif
429 445
430 if (!nexts) 446 if (!nexts)
431 { 447 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer); 448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433 449
434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); 451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
436 452
453#if 0
437 sprintf (number, "%d", event->minor_code); 454 sprintf (number, "RENDER.%d", event->minor_code);
438 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
439 rxvt_warn ("+ (which is %s)\n", buffer); 456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
440 } 458 }
441 459
442 XFreeExtensionList (exts); 460 XFreeExtensionList (exts);
443 } 461 }
444 else 462 else
445 { 463 {
446 sprintf (number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
447 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
448 rxvt_warn ("+ (which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
449 } 467 }
450 468
451 if (event->error_code == BadWindow 469 if (event->error_code == BadWindow
452 || event->error_code == BadPixmap 470 || event->error_code == BadPixmap
453 || event->error_code == BadCursor 471 || event->error_code == BadCursor
454 || event->error_code == BadFont 472 || event->error_code == BadFont
455 || event->error_code == BadDrawable 473 || event->error_code == BadDrawable
456 || event->error_code == BadColor 474 || event->error_code == BadColor
457 || event->error_code == BadGC 475 || event->error_code == BadGC
458 || event->error_code == BadIDChoice 476 || event->error_code == BadIDChoice
459 || event->error_code == BadValue 477 || event->error_code == BadValue
460 || event->error_code == BadAtom) 478 || event->error_code == BadAtom)
461 { 479 {
462 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
464 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
466 else 484 else
467 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
468 486
469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 } 488 }
471} 489}
472#endif 490#endif
473 491
474int ecb_cold 492int ecb_cold
475rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
476{ 494{
477 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
478 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
479 else 497 else
480 { 498 {
481 // 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,
482 // so just output the error and continue 500 // so just output the error and continue
… …
815 833
816 delete fontset[0]; 834 delete fontset[0];
817 fontset[0] = fs; 835 fontset[0] = fs;
818 836
819 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
820 prop.width += letterSpace; 838 prop.width = max (prop.width + letterSpace, 1);
821 839
822 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
823 841
824 fwidth = prop.width; 842 fwidth = prop.width;
825 fheight = prop.height + lineSpace; 843 fheight = prop.height + lineSpace;
… …
925 943
926void 944void
927rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
928{ 946{
929#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
930 rxvt_color xcol;
931
932 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
933 return; 949 return;
934 950
935 color = strdup (color); 951 color = strdup (color);
936 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
… …
942 int i = atoi (color); 958 int i = atoi (color);
943 959
944 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
945 { 961 {
946 /* bright colors */ 962 /* bright colors */
947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
948 goto done; 964 goto done;
949 } 965 }
950 966
951 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
952 { 968 {
953 /* normal colors */ 969 /* normal colors */
954 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
955 goto done; 971 goto done;
956 } 972 }
957 } 973 }
958 974
959 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
960 976 set_color (pix_colors_focused[idx], color);
961 /*
962 * FIXME: should free colors here, but no idea how to do it so instead,
963 * so just keep gobbling up the colormap
964 */
965
966 pix_colors_focused[idx] = xcol;
967 977
968done: 978done:
969 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
970 980
971 update_fade_color (idx); 981 update_fade_color (idx);
972 recolour_cursor (); 982 recolor_cursor ();
973 scr_recolour (); 983 scr_recolor ();
974#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
975} 985}
976 986
977void 987void
978rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
979{ 989{
980 XColor fg, bg; 990 XColor fg, bg;
981 991
982 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
983 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
1038} 1048}
1039 1049
1040void 1050void
1041rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
1042{ 1052{
1053 pix_colors[dst].free (this);
1043 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]);
1044} 1055}
1045 1056
1046/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
1047 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
… …
1361 unsigned long fg, bg; 1372 unsigned long fg, bg;
1362 const char *p; 1373 const char *p;
1363 char **s; 1374 char **s;
1364 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1365 1376
1366 set_environ (envv); 1377 set_environ (env);
1367 1378
1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1369 return false; 1380 return false;
1370 1381
1371 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1372 if (input_method == NULL) 1383 if (input_method == NULL)
1373 return false; 1384 return false;
… …
1681rxvt_term::update_background () 1692rxvt_term::update_background ()
1682{ 1693{
1683 if (update_background_ev.is_active ()) 1694 if (update_background_ev.is_active ())
1684 return; 1695 return;
1685 1696
1686 bg_invalidate ();
1687
1688 if (!mapped)
1689 return;
1690
1691 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1692 1698
1693 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1694 bg_render (); 1700 bg_render ();
1695 else 1701 else

Diff Legend

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