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.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.330 by sf-exg, Mon Jul 26 09:57:53 2010 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
35#include "keyboard.h" 35#include "keyboard.h"
36#include "rxvtperl.h" 36#include "rxvtperl.h"
37 37
38#include <limits> 38#include <limits>
39 39
40#include <cassert>
40#include <csignal> 41#include <csignal>
41#include <cstring> 42#include <cstring>
42 43
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44#include <termios.h>
45#endif
46 45
47#ifdef HAVE_XSETLOCALE 46#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 47# define X_LOCALE
49# include <X11/Xlocale.h> 48# include <X11/Xlocale.h>
50#else 49#else
… …
103 { 102 {
104 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
106 } 105 }
107 106
108 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.end (); cc-- > v.begin (); )
110 { 109 {
111 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
113 } 112 }
… …
152 151
153} 152}
154#endif 153#endif
155 154
156rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
157 : 156{
157#if HAVE_BG_PIXMAP
158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159#endif
160#ifdef CURSOR_BLINK
161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif
163#ifdef TEXT_BLINK
164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif
169#ifdef SELECTION_SCROLLING
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 177#endif
161#if HAVE_BG_PIXMAP 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 179#ifdef USE_XIM
163#endif 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 181#endif
182#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 184#endif
188#ifndef NO_BELL 185#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 187#endif
191 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 195
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 197
202 termlist.push_back (this); 198 termlist.push_back (this);
203 199
204#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
230 delete fontset[i]; 226 delete fontset[i];
231#endif 227#endif
232 delete fontset[0]; 228 delete fontset[0];
233 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
234 if (display) 240 if (display)
235 { 241 {
236 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
237 244
238#ifdef USE_XIM 245#ifdef USE_XIM
239 im_destroy (); 246 im_destroy ();
240#endif 247#endif
241#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 249 if (gc) XFreeGC (dpy, gc);
266 250
267 delete drawable; 251 delete drawable;
268 // destroy all windows 252 // destroy all windows
269 if (parent[0]) 253 if (parent[0])
… …
277 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
278#endif 262#endif
279 } 263 }
280 264
281 clear (); 265 clear ();
282 }
283 266
284 delete [] pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 268 displays.put (display);
269 }
293 270
294 scr_release (); 271 scr_release ();
295 272
296 /* clear all resources */ 273 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 275 free (allocated [i]);
299 276
300 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
301 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
302 free (env_display); 280 free (env_display);
303 free (env_term); 281 free (env_term);
304 free (locale); 282 free (locale);
305 free (v_buffer); 283 free (v_buffer);
… …
329} 307}
330 308
331void 309void
332rxvt_term::destroy () 310rxvt_term::destroy ()
333{ 311{
334 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
335 return; 313 return;
336 314
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 316
339#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
343 if (display) 321 if (display)
344 { 322 {
345#if USE_XIM 323#if USE_XIM
346 im_ev.stop (display); 324 im_ev.stop (display);
347#endif 325#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
350#endif
351#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
353#endif 329#endif
354 incr_ev.stop (); 330 incr_ev.stop ();
355 termwin_ev.stop (display); 331 termwin_ev.stop (display);
356 vt_ev.stop (display); 332 vt_ev.stop (display);
357 } 333 }
358 334
359 prepare_ev.stop (); 335 flush_ev.stop ();
360 pty_ev.stop (); 336 pty_ev.stop ();
361#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
363#endif 339#endif
364#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
407 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
408 char number[32]; 384 char number[32];
409 char *mtype = "XlibMessage"; 385 char *mtype = "XlibMessage";
410 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
411 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
412 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
413 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
414 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
416 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
417 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
418 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
419 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
420 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
421 mesg, BUFSIZ); 397 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
423 } 399 }
424 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
425 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
426 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
427 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
428 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
429 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
430 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
431 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
432 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
433 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
434 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
435 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
436 mesg, BUFSIZ); 412 mesg, BUFSIZ);
437 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
438 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
439 mesg, BUFSIZ); 415 mesg, BUFSIZ);
440 else 416 else
441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
442 mesg, BUFSIZ); 418 mesg, BUFSIZ);
443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
444 } 420 }
445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
446 mesg, BUFSIZ); 422 mesg, BUFSIZ);
447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
448} 424}
449#endif 425#endif
450 426
451int 427int
… …
474 DisplayString (display)); 450 DisplayString (display));
475 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
477} 453}
478 454
479/*----------------------------------------------------------------------*/
480bool
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{
483 this->envv = envv;
484
485 SET_R (this);
486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
488
489 if (!init_vars ())
490 return false;
491
492 init_secondary ();
493
494 const char **cmd_argv = init_resources (argc, argv);
495
496#ifdef KEYSYM_RESOURCE
497 keyboard->register_done ();
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (option (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */
503#endif
504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
567#endif
568
569 set_colorfgbg ();
570
571 init_command (cmd_argv);
572
573 free (cmd_argv);
574
575 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ);
577
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
595 return true;
596}
597
598static struct sig_handlers 455static struct sig_handlers
599{ 456{
600 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
601 458
602 /* 459 /*
603 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
604 */ 461 */
605 void
606 sig_term (ev::sig &w, int revents) 462 void sig_term (ev::sig &w, int revents);
463
464 sig_handlers ()
607 { 465 {
608 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
609 w.stop ();
610 kill (getpid (), w.signum);
611 }
612
613 sig_handlers ()
614 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616 {
617 } 468 }
618} sig_handlers; 469} sig_handlers;
619 470
471void
472sig_handlers::sig_term (ev::sig &w, int revents)
473{
474 rxvt_emergency_cleanup ();
475 w.stop ();
476 kill (getpid (), w.signum);
477}
478
620char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
621 480
622void 481void
623rxvt_init () 482rxvt_init ()
624{ 483{
484 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486
625 ptytty::init (); 487 ptytty::init ();
626 488
627 if (!ev::ev_default_loop (0)) 489 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629 491
630 rxvt_environ = environ; 492 rxvt_environ = environ;
631 493
632 signal (SIGHUP, SIG_IGN); 494 signal (SIGHUP, SIG_IGN);
633 signal (SIGPIPE, SIG_IGN); 495 signal (SIGPIPE, SIG_IGN);
634 496
635 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
637
638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
639 /* signal (SIGURG, SIG_DFL); */
640 499
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 500 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 501 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 502 XSetIOErrorHandler (rxvt_xioerror_handler);
644 503
645 XrmInitialize (); 504 XrmInitialize ();
646}
647
648/* ------------------------------------------------------------------------- *
649 * MEMORY ALLOCATION WRAPPERS *
650 * ------------------------------------------------------------------------- */
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682} 505}
683 506
684/*----------------------------------------------------------------------*/ 507/*----------------------------------------------------------------------*/
685/* 508/*
686 * window size/position calculations for XSizeHint and other storage. 509 * window size/position calculations for XSizeHint and other storage.
… …
688 */ 511 */
689void 512void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 513rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 514{
692 short recalc_x, recalc_y; 515 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 516 int x, y, flags;
694 unsigned int w, h; 517 unsigned int w, h;
695 unsigned int max_width, max_height; 518 unsigned int max_width, max_height;
696 519
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 520 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 521 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 531 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 532 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 533
711 if (flags & WidthValue) 534 if (flags & WidthValue)
712 { 535 {
536 if (!w)
537 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
538
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 539 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 540 szHint.flags |= USSize;
715 } 541 }
716 542
717 if (flags & HeightValue) 543 if (flags & HeightValue)
718 { 544 {
545 if (!h)
546 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
547
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 548 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 549 szHint.flags |= USSize;
721 } 550 }
722 551
723 if (flags & XValue) 552 if (flags & XValue)
724 { 553 {
… …
755 max_width = MAX_COLS * fwidth; 584 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 585 max_height = MAX_ROWS * fheight;
757 586
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 588
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 589 window_vt_x = window_vt_y = int_bwidth;
762 590
763 if (scrollBar.state) 591 if (scrollBar.state)
764 { 592 {
765 sb_w = scrollbar_TotalWidth (); 593 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 594 szHint.base_width += sb_w;
767 595
768 if (!option (Opt_scrollBar_right)) 596 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 597 window_vt_x += sb_w;
770 } 598 }
… …
794 { 622 {
795 min_it (height, max_height); 623 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 624 szHint.height = szHint.base_height + height;
797 } 625 }
798 626
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801
802 if (recalc_x) 627 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 628 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 629
805 if (recalc_y) 630 if (recalc_y)
806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807 632
808 ncol = width / fwidth; 633 ncol = width / fwidth;
809 nrow = height / fheight; 634 nrow = height / fheight;
810} 635}
811 636
812/*----------------------------------------------------------------------*/ 637/*----------------------------------------------------------------------*/
813/* 638/*
… …
824 649
825 ws.ws_col = ncol; 650 ws.ws_col = ncol;
826 ws.ws_row = nrow; 651 ws.ws_row = nrow;
827 ws.ws_xpixel = width; 652 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 653 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 654 ioctl (pty->pty, TIOCSWINSZ, &ws);
830 655
831#if 0 656#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 657 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 658 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 659 kill (-cmd_pid, SIGWINCH);
835#endif 660#endif
836} 661}
837 662
… …
864#endif 689#endif
865 690
866 delete fontset[0]; 691 delete fontset[0];
867 fontset[0] = fs; 692 fontset[0] = fs;
868 693
869 prop = (*fs)[1]->properties (); 694 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
870 prop.height += lineSpace; 695 prop.height += lineSpace;
696 prop.width += letterSpace;
871 697
872 fs->set_prop (prop, false); 698 fs->set_prop (prop, false);
873 699
874 fwidth = prop.width; 700 fwidth = prop.width;
875 fheight = prop.height; 701 fheight = prop.height;
… …
925 prop, XA_STRING, 8, PropModeReplace, 751 prop, XA_STRING, 8, PropModeReplace,
926 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 752 (const unsigned char *)str, len >= 0 ? len : strlen (str));
927} 753}
928 754
929void 755void
756rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
757{
758 XTextProperty ct;
759
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 {
762 XSetTextProperty (dpy, parent[0], &ct, prop);
763 XFree (ct.value);
764 }
765}
766
767void
930rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 768rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
931{ 769{
932 wchar_t *ws = rxvt_mbstowcs (str, len); 770 wchar_t *ws = rxvt_mbstowcs (str, len);
933 char *s = rxvt_wcstoutf8 (ws); 771 char *s = rxvt_wcstoutf8 (ws);
934 772
… …
944/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
945/* xterm sequences - title, iconName, color (exptl) */ 783/* xterm sequences - title, iconName, color (exptl) */
946void 784void
947rxvt_term::set_title (const char *str) 785rxvt_term::set_title (const char *str)
948{ 786{
949 set_string_property (XA_WM_NAME, str); 787 set_mbstring_property (XA_WM_NAME, str);
950#if ENABLE_EWMH 788#if ENABLE_EWMH
951 set_utf8_property (xa[XA_NET_WM_NAME], str); 789 set_utf8_property (xa[XA_NET_WM_NAME], str);
952#endif 790#endif
953} 791}
954 792
955void 793void
956rxvt_term::set_icon_name (const char *str) 794rxvt_term::set_icon_name (const char *str)
957{ 795{
958 set_string_property (XA_WM_ICON_NAME, str); 796 set_mbstring_property (XA_WM_ICON_NAME, str);
959#if ENABLE_EWMH 797#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 798 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
961#endif 799#endif
962} 800}
963 801
964void 802void
965rxvt_term::set_window_color (int idx, const char *color) 803rxvt_term::set_window_color (int idx, const char *color)
966{ 804{
967#ifdef XTERM_COLOR_CHANGE 805#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 806 rxvt_color xcol;
969 int i;
970 807
971 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
972 return; 809 return;
973 810
974 color = strdup (color); 811 color = strdup (color);
… …
976 rs[Rs_color + idx] = color; 813 rs[Rs_color + idx] = color;
977 814
978 /* handle color aliases */ 815 /* handle color aliases */
979 if (isdigit (*color)) 816 if (isdigit (*color))
980 { 817 {
981 i = atoi (color); 818 int i = atoi (color);
982 819
983 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
821 {
984 { /* bright colors */ 822 /* bright colors */
985 i -= 8;
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
987 goto done; 824 goto done;
988 } 825 }
989 826
990 if (i >= 0 && i <= 7) 827 if (i >= 0 && i <= 7)
828 {
991 { /* normal colors */ 829 /* normal colors */
992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
993 goto done; 831 goto done;
994 } 832 }
995 } 833 }
996 834
… …
1001 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
1002 */ 840 */
1003 841
1004 pix_colors_focused[idx] = xcol; 842 pix_colors_focused[idx] = xcol;
1005 843
1006 /* XSetWindowAttributes attr; */
1007 /* Cursor cursor; */
1008done: 844done:
1009 /*TODO: handle Color_BD, scrollbar background, etc. */ 845 /*TODO: handle Color_BD, scrollbar background, etc. */
1010 846
1011 update_fade_color (idx); 847 update_fade_color (idx);
1012 recolour_cursor (); 848 recolour_cursor ();
… …
1036 */ 872 */
1037void 873void
1038rxvt_term::set_colorfgbg () 874rxvt_term::set_colorfgbg ()
1039{ 875{
1040 unsigned int i; 876 unsigned int i;
1041 const char *xpmb = "\0"; 877 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043 879
1044 strcpy (fstr, "default"); 880 strcpy (fstr, "default");
1045 strcpy (bstr, "default"); 881 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 882 for (i = Color_Black; i <= Color_White; i++)
… …
1091 int old_width = szHint.width; 927 int old_width = szHint.width;
1092 int old_height = szHint.height; 928 int old_height = szHint.height;
1093 929
1094 window_calc (newwidth, newheight); 930 window_calc (newwidth, newheight);
1095 931
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 932 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
933
934 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
935 if (set_hint)
936 {
937 szHint.flags &= ~(PBaseSize | PResizeInc);
1097 XSetWMNormalHints (dpy, parent[0], &szHint); 938 XSetWMNormalHints (dpy, parent[0], &szHint);
939 szHint.flags |= PBaseSize | PResizeInc;
940 }
1098 941
1099 if (!ignoreparent) 942 if (!ignoreparent)
1100 { 943 {
1101#ifdef SMART_RESIZE 944#ifdef SMART_RESIZE
1102 /* 945 /*
… …
1142#else 985#else
1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1144#endif 987#endif
1145 } 988 }
1146 989
990 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint);
992
1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 993 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1148 994
1149 if (fix_screen || newwidth != old_width || newheight != old_height) 995 if (fix_screen || newwidth != old_width || newheight != old_height)
1150 { 996 {
1151 if (scrollBar.state) 997 if (scrollBar.state)
1152 { 998 scrollBar.resize ();
1153 XMoveResizeWindow (dpy, scrollBar.win,
1154 window_sb_x, 0,
1155 scrollbar_TotalWidth (), szHint.height);
1156 resize_scrollbar ();
1157 }
1158 999
1159 XMoveResizeWindow (dpy, vt, 1000 XMoveResizeWindow (dpy, vt,
1160 window_vt_x, window_vt_y, 1001 window_vt_x, window_vt_y,
1161 width, height); 1002 width, height);
1162 1003
1163#ifdef HAVE_BG_PIXMAP 1004#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ()) 1005 if (bgPixmap.window_size_sensitive ())
1165 update_background (); 1006 update_background ();
1166#endif 1007#endif
1167
1168 scr_clear ();
1169 } 1008 }
1170 1009
1171 if (fix_screen || old_height == 0) 1010 if (fix_screen || old_height == 0)
1172 scr_reset (); 1011 scr_reset ();
1173
1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1175 //scr_touch (false);
1176 1012
1177#ifdef HAVE_BG_PIXMAP 1013#ifdef HAVE_BG_PIXMAP
1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1179// if (bgPixmap.pixmap) 1015// if (bgPixmap.pixmap)
1180// scr_touch (false); 1016// scr_touch (false);
… …
1252 1088
1253/* Checking whether input method is running. */ 1089/* Checking whether input method is running. */
1254bool 1090bool
1255rxvt_term::IMisRunning () 1091rxvt_term::IMisRunning ()
1256{ 1092{
1257 char *p;
1258 Atom atom; 1093 Atom atom;
1259 Window win; 1094 Window win;
1260 char server[IMBUFSIZ]; 1095 char server[IMBUFSIZ];
1261 1096
1262 /* get current locale modifier */ 1097 /* get current locale modifier */
1263 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1098 if (char *p = XSetLocaleModifiers (0))
1264 { 1099 {
1265 strcpy (server, "@server="); 1100 strcpy (server, "@server=");
1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1101 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1267 1102
1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1103 if (p = strchr (server + 1, '@')) /* first one only */
1269 *p = '\0'; 1104 *p = '\0';
1270 1105
1271 atom = XInternAtom (dpy, server, False); 1106 atom = XInternAtom (dpy, server, False);
1272 win = XGetSelectionOwner (dpy, atom); 1107 win = XGetSelectionOwner (dpy, atom);
1273 1108
… …
1340 1175
1341 term->make_current (); 1176 term->make_current ();
1342 1177
1343 if (text) 1178 if (text)
1344 { 1179 {
1345 void *str; 1180 wchar_t *str;
1346 1181
1347 if (!text->encoding_is_wchar && text->string.multi_byte) 1182 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 { 1183 {
1349 // of course, X makes it ugly again 1184 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale]) 1185 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]); 1186 SET_LOCALE (term->rs[Rs_imLocale]);
1352 1187
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1188 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1189 mbstowcs (str, text->string.multi_byte, text->length + 1);
1355 1190
1356 if (term->rs[Rs_imLocale]) 1191 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale); 1192 SET_LOCALE (term->locale);
1358 } 1193 }
1359 else 1194 else
1360 str = (void *)text->string.wide_char; 1195 str = text->string.wide_char;
1361 1196
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret, 1198 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first, 1199 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length, 1200 DT_INT, call_data->chg_length,
… …
1719void 1554void
1720rxvt_term::get_window_origin (int &x, int &y) 1555rxvt_term::get_window_origin (int &x, int &y)
1721{ 1556{
1722 Window cr; 1557 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725} 1560}
1726 1561
1727Pixmap 1562Pixmap
1728rxvt_term::get_pixmap_property (int prop_id) 1563rxvt_term::get_pixmap_property (int prop_id)
1729{ 1564{
… …
1736 unsigned char *prop = NULL; 1571 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop); 1574 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP) 1575 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop; 1576 return *(Pixmap *)prop;
1743 }
1744 } 1577 }
1578
1745 return None; 1579 return None;
1746} 1580}
1747 1581
1748#ifdef HAVE_BG_PIXMAP 1582#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1583# if TRACE_PIXMAPS
1750# undef update_background 1584# undef update_background
1585void
1751int rxvt_term::trace_update_background (const char* file, int line) 1586rxvt_term::trace_update_background (const char *file, int line)
1752{ 1587{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1589 update_background ();
1755} 1590}
1756# endif 1591# endif
1757int 1592
1593void
1758rxvt_term::update_background () 1594rxvt_term::update_background ()
1759{ 1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1760 bgPixmap.invalidate (); 1599 bgPixmap.invalidate ();
1761 1600
1762 /* no chance of real time refresh if we are blurring! */ 1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1602
1603 if (to_wait <= 0.)
1764 bgPixmap.render (); 1604 bgPixmap.render ();
1765 else 1605 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1606 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1607}
1779 1608
1780void 1609void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1611{
1612 make_current ();
1613
1614 update_background_ev.stop ();
1783 bgPixmap.render (); 1615 bgPixmap.render ();
1616 refresh_check ();
1784} 1617}
1785 1618
1786#endif /* HAVE_BG_PIXMAP */ 1619#endif /* HAVE_BG_PIXMAP */
1787 1620
1788/*----------------------- end-of-file (C source) -----------------------*/ 1621/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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