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

Diff Legend

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