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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.318 by root, Sat May 30 08:51:23 2009 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
88class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
89 92
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 94{
92 compose_char *cc; 95 compose_char *cc;
93 96
94 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 99 cc = (*this)[c1];
97 while (cc) 100 while (cc)
98 { 101 {
… …
147 150
148} 151}
149#endif 152#endif
150 153
151rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
152 : 155{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 176#endif
156#if HAVE_BG_PIXMAP 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 update_background_ev(this, &rxvt_term::update_background_cb), 178#ifdef USE_XIM
158#endif 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 180#endif
177#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 183#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 184#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 186#endif
186 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 194
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
224 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
225 delete fontset[i]; 225 delete fontset[i];
226#endif 226#endif
227 delete fontset[0]; 227 delete fontset[0];
228 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
229 if (display) 239 if (display)
230 { 240 {
231 selection_clear (); 241 selection_clear ();
232 242
233#ifdef USE_XIM 243#ifdef USE_XIM
234 im_destroy (); 244 im_destroy ();
235#endif 245#endif
236#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
237 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
238 if (ShadowGC) XFreeGC (dpy, ShadowGC);
239#endif
240#ifdef PLAIN_SCROLLBAR
241 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
242#endif
243#ifdef NEXT_SCROLLBAR
244 if (blackGC) XFreeGC (dpy, blackGC);
245 if (whiteGC) XFreeGC (dpy, whiteGC);
246 if (grayGC) XFreeGC (dpy, grayGC);
247 if (darkGC) XFreeGC (dpy, darkGC);
248 if (stippleGC) XFreeGC (dpy, stippleGC);
249 if (dimple) XFreePixmap (dpy, dimple);
250 if (upArrow) XFreePixmap (dpy, upArrow);
251 if (downArrow) XFreePixmap (dpy, downArrow);
252 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
253 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
254#endif
255#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (dpy, topShadowGC);
257 if (botShadowGC) XFreeGC (dpy, botShadowGC);
258 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
259#endif
260 if (gc) XFreeGC (dpy, gc); 247 if (gc) XFreeGC (dpy, gc);
261 248
262 delete drawable; 249 delete drawable;
263 // destroy all windows 250 // destroy all windows
264 if (parent[0]) 251 if (parent[0])
… …
272 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
273#endif 260#endif
274 } 261 }
275 262
276 clear (); 263 clear ();
277 }
278 264
279 delete [] pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
280#if OFF_FOCUS_FADING
281 delete [] pix_colors_unfocused;
282#endif
283
284 displays.put (display); 266 displays.put (display);
267 }
285 268
286 scr_release (); 269 scr_release ();
287 270
288 /* clear all resources */ 271 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
… …
301 delete argv; 284 delete argv;
302 285
303#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
304 delete keyboard; 287 delete keyboard;
305#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
306} 292}
307 293
308// child has exited, usually destroys 294// child has exited, usually destroys
309void 295void
310rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
311{ 297{
312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313 299
314 cmd_pid = 0; 300 cmd_pid = 0;
315 301
… …
318} 304}
319 305
320void 306void
321rxvt_term::destroy () 307rxvt_term::destroy ()
322{ 308{
323 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
324 return; 310 return;
325 311
326 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327 313
328#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
… …
332 if (display) 318 if (display)
333 { 319 {
334#if USE_XIM 320#if USE_XIM
335 im_ev.stop (display); 321 im_ev.stop (display);
336#endif 322#endif
337#if HAVE_SCROLLBARS
338 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
339#endif
340#if ENABLE_TRANSPARENCY || ENABLE_PERL 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
341 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
342#endif 326#endif
343 incr_ev.stop (); 327 incr_ev.stop ();
344 termwin_ev.stop (display); 328 termwin_ev.stop (display);
345 vt_ev.stop (display); 329 vt_ev.stop (display);
346 } 330 }
347 331
348 check_ev.stop (); 332 flush_ev.stop ();
349 pty_ev.stop (); 333 pty_ev.stop ();
350#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
351 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
352#endif 336#endif
353#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
361#endif 345#endif
362#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
363 pointer_ev.stop (); 347 pointer_ev.stop ();
364#endif 348#endif
365 349
366 destroy_ev.start (0); 350 destroy_ev.start ();
367} 351}
368 352
369void 353void
370rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
371{ 355{
372 make_current (); 356 make_current ();
373 357
374 delete this; 358 delete this;
375} 359}
… …
429 else 413 else
430 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431 mesg, BUFSIZ); 415 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433 } 417 }
434 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435 mesg, BUFSIZ); 419 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437} 421}
438#endif 422#endif
439 423
… …
463 DisplayString (display)); 447 DisplayString (display));
464 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
465 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
466} 450}
467 451
468/*----------------------------------------------------------------------*/
469bool
470rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
471{
472 this->envv = envv;
473
474 SET_R (this);
475 set_locale ("");
476 set_environ (envv); // few things in X do not call setlocale :(
477
478 if (!init_vars ())
479 return false;
480
481 init_secondary ();
482
483 const char **cmd_argv = init_resources (argc, argv);
484
485#ifdef KEYSYM_RESOURCE
486 keyboard->register_done ();
487#endif
488
489#ifdef HAVE_SCROLLBARS
490 if (option (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */
492#endif
493
494 pty = ptytty::create ();
495
496 create_windows (argc, argv);
497
498 init_xlocale ();
499
500 scr_reset (); // initialize screen
501
502#if 0
503 XSynchronize (dpy, True);
504#endif
505
506#ifdef HAVE_SCROLLBARS
507 if (option (Opt_scrollBar))
508 resize_scrollbar (); /* create and map scrollbar */
509#endif
510#ifdef HAVE_BG_PIXMAP
511 {
512 bgPixmap.set_target (this);
513
514#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent))
516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526
527 bgPixmap.set_root_pixmap ();
528 XSelectInput (dpy, display->root, PropertyChangeMask);
529 rootwin_ev.start (display, display->root);
530 }
531#endif
532
533#ifdef BG_IMAGE_FROM_FILE
534 if (rs[Rs_backgroundPixmap] != NULL)
535 {
536 const char *p = rs[Rs_backgroundPixmap];
537
538 if ((p = strchr (p, ';')) != NULL)
539 {
540 p++;
541 bgPixmap.set_geometry (p);
542 }
543 else
544 bgPixmap.set_defaultGeometry ();
545
546 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547 if (!bgPixmap.window_position_sensitive ())
548 update_background ();
549 }
550#endif
551 }
552#endif
553
554#if ENABLE_PERL
555 rootwin_ev.start (display, display->root);
556#endif
557
558 set_colorfgbg ();
559
560 init_command (cmd_argv);
561
562 free (cmd_argv);
563
564 if (pty->pty >= 0)
565 pty_ev.start (pty->pty, EVENT_READ);
566
567 check_ev.start ();
568
569 HOOK_INVOKE ((this, HOOK_START, DT_END));
570
571#if ENABLE_XEMBED
572 if (rs[Rs_embed])
573 {
574 long info[2] = { 0, XEMBED_MAPPED };
575
576 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
577 32, PropModeReplace, (unsigned char *)&info, 2);
578 }
579#endif
580
581 XMapWindow (dpy, vt);
582 XMapWindow (dpy, parent[0]);
583
584 return true;
585}
586
587static struct sig_handlers 452static struct sig_handlers
588{ 453{
589 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
590 455
591 /* 456 /*
592 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
593 */ 458 */
594 void 459 void sig_term (ev::sig &w, int revents);
595 sig_term (sig_watcher &w) 460
461 sig_handlers ()
596 { 462 {
597 rxvt_emergency_cleanup (); 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
598 signal (w.signum, SIG_DFL);
599 kill (getpid (), w.signum);
600 }
601
602 sig_handlers ()
603 : sw_term (this, &sig_handlers::sig_term),
604 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605 {
606 } 465 }
607} sig_handlers; 466} sig_handlers;
608 467
468void
469sig_handlers::sig_term (ev::sig &w, int revents)
470{
471 rxvt_emergency_cleanup ();
472 w.stop ();
473 kill (getpid (), w.signum);
474}
475
609char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
610 477
611void 478void
612rxvt_init () 479rxvt_init ()
613{ 480{
614 ptytty::init (); 481 ptytty::init ();
482
483 if (!ev_default_loop (0))
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615 485
616 rxvt_environ = environ; 486 rxvt_environ = environ;
617 487
618 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
619 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
620 490
621 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623 493
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
626 496
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
628 // TODO: handle this with exceptions and tolerate the memory loss 498 // TODO: handle this with exceptions and tolerate the memory loss
629 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
630 500
631 XrmInitialize (); 501 XrmInitialize ();
632}
633
634/* ------------------------------------------------------------------------- *
635 * MEMORY ALLOCATION WRAPPERS *
636 * ------------------------------------------------------------------------- */
637void *
638rxvt_malloc (size_t size)
639{
640 void *p = malloc (size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648void *
649rxvt_calloc (size_t number, size_t size)
650{
651 void *p = calloc (number, size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_realloc (void *ptr, size_t size)
661{
662 void *p = realloc (ptr, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668} 502}
669 503
670/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
671/* 505/*
672 * window size/position calculations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
… …
674 */ 508 */
675void 509void
676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
677{ 511{
678 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
679 int x, y, sb_w, flags; 513 int x, y, flags;
680 unsigned int w, h; 514 unsigned int w, h;
681 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
682 516
683 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
684 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
… …
694 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
695 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
696 530
697 if (flags & WidthValue) 531 if (flags & WidthValue)
698 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
699 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
700 szHint.flags |= USSize; 537 szHint.flags |= USSize;
701 } 538 }
702 539
703 if (flags & HeightValue) 540 if (flags & HeightValue)
704 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
705 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
706 szHint.flags |= USSize; 546 szHint.flags |= USSize;
707 } 547 }
708 548
709 if (flags & XValue) 549 if (flags & XValue)
710 { 550 {
… …
741 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
742 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
743 583
744 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
745 585
746 sb_w = 0;
747 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
748 587
749 if (scrollBar.state) 588 if (scrollBar.state)
750 { 589 {
751 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
752 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
753 592
754 if (!option (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
755 window_vt_x += sb_w; 594 window_vt_x += sb_w;
756 } 595 }
… …
780 { 619 {
781 min_it (height, max_height); 620 min_it (height, max_height);
782 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
783 } 622 }
784 623
785 if (scrollBar.state && option (Opt_scrollBar_right))
786 window_sb_x = szHint.width - sb_w;
787
788 if (recalc_x) 624 if (recalc_x)
789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
790 626
791 if (recalc_y) 627 if (recalc_y)
792 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
793 629
794 ncol = width / fwidth; 630 ncol = width / fwidth;
795 nrow = height / fheight; 631 nrow = height / fheight;
796} 632}
797 633
798/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
799/* 635/*
… …
810 646
811 ws.ws_col = ncol; 647 ws.ws_col = ncol;
812 ws.ws_row = nrow; 648 ws.ws_row = nrow;
813 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
814 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
815 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
816 652
817#if 0 653#if 0
818 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
819 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
820 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
821#endif 657#endif
822} 658}
823 659
… …
852 delete fontset[0]; 688 delete fontset[0];
853 fontset[0] = fs; 689 fontset[0] = fs;
854 690
855 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
856 prop.height += lineSpace; 692 prop.height += lineSpace;
693 prop.width += letterSpace;
857 694
858 fs->set_prop (prop, false); 695 fs->set_prop (prop, false);
859 696
860 fwidth = prop.width; 697 fwidth = prop.width;
861 fheight = prop.height; 698 fheight = prop.height;
… …
897 if (parent[0]) 734 if (parent[0])
898 { 735 {
899 resize_all_windows (0, 0, 0); 736 resize_all_windows (0, 0, 0);
900 scr_remap_chars (); 737 scr_remap_chars ();
901 scr_touch (true); 738 scr_touch (true);
902 } 739 }
903 740
904 return true; 741 return true;
905} 742}
906 743
907void 744void
… …
950void 787void
951rxvt_term::set_window_color (int idx, const char *color) 788rxvt_term::set_window_color (int idx, const char *color)
952{ 789{
953#ifdef XTERM_COLOR_CHANGE 790#ifdef XTERM_COLOR_CHANGE
954 rxvt_color xcol; 791 rxvt_color xcol;
955 int i; 792
956
957 if (color == NULL || *color == '\0') 793 if (color == NULL || *color == '\0')
958 return; 794 return;
959 795
960 color = strdup (color); 796 color = strdup (color);
961 allocated.push_back ((void *)color); 797 allocated.push_back ((void *)color);
962 rs[Rs_color + idx] = color; 798 rs[Rs_color + idx] = color;
963 799
964 /* handle color aliases */ 800 /* handle color aliases */
965 if (isdigit (*color)) 801 if (isdigit (*color))
966 { 802 {
967 i = atoi (color); 803 int i = atoi (color);
968 804
969 if (i >= 8 && i <= 15) 805 if (i >= 8 && i <= 15)
806 {
970 { /* bright colors */ 807 /* bright colors */
971 i -= 8;
972 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 808 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973 goto done; 809 goto done;
974 } 810 }
975 811
976 if (i >= 0 && i <= 7) 812 if (i >= 0 && i <= 7)
813 {
977 { /* normal colors */ 814 /* normal colors */
978 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 815 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979 goto done; 816 goto done;
980 } 817 }
981 } 818 }
982 819
… …
987 * so just keep gobbling up the colormap 824 * so just keep gobbling up the colormap
988 */ 825 */
989 826
990 pix_colors_focused[idx] = xcol; 827 pix_colors_focused[idx] = xcol;
991 828
992 /* XSetWindowAttributes attr; */
993 /* Cursor cursor; */
994done: 829done:
995 /*TODO: handle Color_BD, scrollbar background, etc. */ 830 /*TODO: handle Color_BD, scrollbar background, etc. */
996 831
997 update_fade_color (idx); 832 update_fade_color (idx);
998 recolour_cursor (); 833 recolour_cursor ();
999 scr_recolour (); 834 scr_recolour ();
1000#endif /* XTERM_COLOR_CHANGE */ 835#endif /* XTERM_COLOR_CHANGE */
1001} 836}
1002 837
1003void 838void
1004rxvt_term::recolour_cursor () 839rxvt_term::recolour_cursor ()
1005{ 840{
… …
1022 */ 857 */
1023void 858void
1024rxvt_term::set_colorfgbg () 859rxvt_term::set_colorfgbg ()
1025{ 860{
1026 unsigned int i; 861 unsigned int i;
1027 const char *xpmb = "\0"; 862 const char *xpmb = "";
1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 863 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029 864
1030 strcpy (fstr, "default"); 865 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 866 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 867 for (i = Color_Black; i <= Color_White; i++)
… …
1077 int old_width = szHint.width; 912 int old_width = szHint.width;
1078 int old_height = szHint.height; 913 int old_height = szHint.height;
1079 914
1080 window_calc (newwidth, newheight); 915 window_calc (newwidth, newheight);
1081 916
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 917 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
918
919 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
920 if (set_hint)
921 {
922 szHint.flags &= ~(PBaseSize | PResizeInc);
1083 XSetWMNormalHints (dpy, parent[0], &szHint); 923 XSetWMNormalHints (dpy, parent[0], &szHint);
924 szHint.flags |= PBaseSize | PResizeInc;
925 }
1084 926
1085 if (!ignoreparent) 927 if (!ignoreparent)
1086 { 928 {
1087#ifdef SMART_RESIZE 929#ifdef SMART_RESIZE
1088 /* 930 /*
… …
1128#else 970#else
1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 971 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1130#endif 972#endif
1131 } 973 }
1132 974
975 if (set_hint)
976 XSetWMNormalHints (dpy, parent[0], &szHint);
977
1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1134 979
1135 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1136 { 981 {
1137 if (scrollBar.state) 982 if (scrollBar.state)
1138 { 983 scrollBar.resize ();
1139 XMoveResizeWindow (dpy, scrollBar.win,
1140 window_sb_x, 0,
1141 scrollbar_TotalWidth (), szHint.height);
1142 resize_scrollbar ();
1143 }
1144 984
1145 XMoveResizeWindow (dpy, vt, 985 XMoveResizeWindow (dpy, vt,
1146 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1147 width, height); 987 width, height);
1148 988
1149#ifdef HAVE_BG_PIXMAP 989#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ()) 990 if (bgPixmap.window_size_sensitive ())
1151 update_background (); 991 update_background ();
1152#endif 992#endif
1153
1154 scr_clear ();
1155 } 993 }
1156 994
1157 if (fix_screen || old_height == 0) 995 if (fix_screen || old_height == 0)
1158 scr_reset (); 996 scr_reset ();
1159 997
… …
1238 1076
1239/* Checking whether input method is running. */ 1077/* Checking whether input method is running. */
1240bool 1078bool
1241rxvt_term::IMisRunning () 1079rxvt_term::IMisRunning ()
1242{ 1080{
1243 char *p;
1244 Atom atom; 1081 Atom atom;
1245 Window win; 1082 Window win;
1246 char server[IMBUFSIZ]; 1083 char server[IMBUFSIZ];
1247 1084
1248 /* get current locale modifier */ 1085 /* get current locale modifier */
1249 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1086 if (char *p = XSetLocaleModifiers (0))
1250 { 1087 {
1251 strcpy (server, "@server="); 1088 strcpy (server, "@server=");
1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1089 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1253 1090
1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1091 if (p = strchr (server + 1, '@')) /* first one only */
1255 *p = '\0'; 1092 *p = '\0';
1256 1093
1257 atom = XInternAtom (dpy, server, False); 1094 atom = XInternAtom (dpy, server, False);
1258 win = XGetSelectionOwner (dpy, atom); 1095 win = XGetSelectionOwner (dpy, atom);
1259 1096
… …
1342 if (term->rs[Rs_imLocale]) 1179 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1180 SET_LOCALE (term->locale);
1344 } 1181 }
1345 else 1182 else
1346 str = (void *)text->string.wide_char; 1183 str = (void *)text->string.wide_char;
1347 1184
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1185 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1186 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1187 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1188 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1189 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1671 1508
1672 if (input_style & XIMPreeditPosition) 1509 if (input_style & XIMPreeditPosition)
1673 { 1510 {
1674 im_set_size (preedit_rect); 1511 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1512 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1513
1677 XSetICValues (Input_Context, 1514 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1515 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1516 }
1680 else 1517 else
1681 { 1518 {
… …
1698 XFree (status_attr); 1535 XFree (status_attr);
1699 } 1536 }
1700 1537
1701 XFree (preedit_attr); 1538 XFree (preedit_attr);
1702} 1539}
1703#endif /* USE_XIM */ 1540#endif /* USE_XIM */
1704 1541
1705void 1542void
1706rxvt_term::get_window_origin (int &x, int &y) 1543rxvt_term::get_window_origin (int &x, int &y)
1707{ 1544{
1708 Window cr; 1545 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1546 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1547/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1711} 1548}
1712 1549
1713Pixmap 1550Pixmap
1714rxvt_term::get_pixmap_property (int prop_id) 1551rxvt_term::get_pixmap_property (int prop_id)
1715{ 1552{
… …
1722 unsigned char *prop = NULL; 1559 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1560 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1561 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop); 1562 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP) 1563 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop; 1564 return *(Pixmap *)prop;
1729 }
1730 } 1565 }
1566
1731 return None; 1567 return None;
1732} 1568}
1733 1569
1734#ifdef HAVE_BG_PIXMAP 1570#ifdef HAVE_BG_PIXMAP
1735int 1571# if TRACE_PIXMAPS
1572# undef update_background
1573void
1574rxvt_term::trace_update_background (const char *file, int line)
1575{
1576 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1577 update_background ();
1578}
1579# endif
1580
1581void
1736rxvt_term::update_background () 1582rxvt_term::update_background ()
1737{ 1583{
1584 if (update_background_ev.is_active ())
1585 return;
1586
1738 bgPixmap.invalidate (); 1587 bgPixmap.invalidate ();
1739 1588
1740 /* no chance of real time refresh if we are blurring ! */ 1589 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1590
1591 if (to_wait <= 0.)
1742 bgPixmap.render (); 1592 bgPixmap.render ();
1743 else 1593 else
1744 { 1594 update_background_ev.start (to_wait);
1595}
1596
1597void
1598rxvt_term::update_background_cb (ev::timer &w, int revents)
1599{
1600 make_current ();
1601
1745 update_background_ev.stop (); 1602 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render (); 1603 bgPixmap.render ();
1604 refresh_check ();
1760} 1605}
1761 1606
1762#endif /* HAVE_BG_PIXMAP */ 1607#endif /* HAVE_BG_PIXMAP */
1763 1608
1764/*----------------------- end-of-file (C source) -----------------------*/ 1609/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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