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.231 by root, Sun Aug 27 10:14:47 2006 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{
153#if TRANSPARENT || ENABLE_PERL 156#if HAVE_BG_PIXMAP
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev (this, &rxvt_term::x_cb),
158#endif 158#endif
159#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 161#endif
162#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
163 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif 164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif 167#endif
168#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
173#endif 180#endif
174#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
175 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176#endif 183#endif
177#ifdef USE_XIM
178 im_ev (this, &rxvt_term::im_cb),
179#endif
180#ifndef NO_BELL 184#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182#endif 186#endif
183 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190 incr_ev (this, &rxvt_term::incr_cb) 194
191{
192 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193 196
194 termlist.push_back (this); 197 termlist.push_back (this);
195 198
196#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
198#endif 201#endif
199} 202}
200 203
201// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
202// for use before an emergency exit 205// for use before an emergency exit
206void
203void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
204{ 208{
205 if (cmd_pid) 209 if (cmd_pid)
206 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
207 211
208 pty_ev.stop (); 212 pty_ev.stop ();
220 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
221 delete fontset[i]; 225 delete fontset[i];
222#endif 226#endif
223 delete fontset[0]; 227 delete fontset[0];
224 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
225 if (display) 239 if (display)
226 { 240 {
227 selection_clear (); 241 selection_clear ();
228 242
229#ifdef USE_XIM 243#ifdef USE_XIM
230 im_destroy (); 244 im_destroy ();
231#endif 245#endif
232#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
235#endif
236#ifdef PLAIN_SCROLLBAR
237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
238#endif
239#ifdef NEXT_SCROLLBAR
240 if (blackGC) XFreeGC (dpy, blackGC);
241 if (whiteGC) XFreeGC (dpy, whiteGC);
242 if (grayGC) XFreeGC (dpy, grayGC);
243 if (darkGC) XFreeGC (dpy, darkGC);
244 if (stippleGC) XFreeGC (dpy, stippleGC);
245 if (dimple) XFreePixmap (dpy, dimple);
246 if (upArrow) XFreePixmap (dpy, upArrow);
247 if (downArrow) XFreePixmap (dpy, downArrow);
248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
250#endif
251#ifdef RXVT_SCROLLBAR
252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
255#endif
256 if (gc) XFreeGC (dpy, gc); 247 if (gc) XFreeGC (dpy, gc);
257 248
258 delete drawable; 249 delete drawable;
259 // destroy all windows 250 // destroy all windows
260 if (parent[0]) 251 if (parent[0])
268 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
269#endif 260#endif
270 } 261 }
271 262
272 clear (); 263 clear ();
273 }
274 264
275 delete [] pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
276#if OFF_FOCUS_FADING
277 delete [] pix_colors_unfocused;
278#endif
279
280 displays.put (display); 266 displays.put (display);
267 }
281 268
282 scr_release (); 269 scr_release ();
283 270
284 /* clear all resources */ 271 /* clear all resources */
285 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
297 delete argv; 284 delete argv;
298 285
299#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
300 delete keyboard; 287 delete keyboard;
301#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
302} 292}
303 293
304// child has exited, usually destroys 294// child has exited, usually destroys
305void 295void
306rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
307{ 297{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 299
310 cmd_pid = 0; 300 cmd_pid = 0;
311 301
312 if (!OPTION (Opt_hold)) 302 if (!option (Opt_hold))
313 destroy (); 303 destroy ();
314} 304}
315 305
316void 306void
317rxvt_term::destroy () 307rxvt_term::destroy ()
318{ 308{
319 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
320 return; 310 return;
321 311
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 313
324#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
328 if (display) 318 if (display)
329 { 319 {
330#if USE_XIM 320#if USE_XIM
331 im_ev.stop (display); 321 im_ev.stop (display);
332#endif 322#endif
333#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
335#endif
336#if TRANSPARENT || ENABLE_PERL 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
338#endif 326#endif
339 incr_ev.stop (); 327 incr_ev.stop ();
340 termwin_ev.stop (display); 328 termwin_ev.stop (display);
341 vt_ev.stop (display); 329 vt_ev.stop (display);
342 } 330 }
343 331
344 check_ev.stop (); 332 flush_ev.stop ();
345 pty_ev.stop (); 333 pty_ev.stop ();
346#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
348#endif 336#endif
349#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
357#endif 345#endif
358#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
359 pointer_ev.stop (); 347 pointer_ev.stop ();
360#endif 348#endif
361 349
362 destroy_ev.start (0); 350 destroy_ev.start ();
363} 351}
364 352
365void 353void
366rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 355{
368 make_current (); 356 make_current ();
369 357
370 delete this; 358 delete this;
371} 359}
425 else 413 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 415 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 417 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 419 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 421}
434#endif 422#endif
435 423
459 DisplayString (display)); 447 DisplayString (display));
460 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
461 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
462} 450}
463 451
464/*----------------------------------------------------------------------*/
465bool
466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{
468 this->envv = envv;
469
470 SET_R (this);
471 set_locale ("");
472 set_environ (envv); // few things in X do not call setlocale :(
473
474 if (!init_vars ())
475 return false;
476
477 init_secondary ();
478
479 const char **cmd_argv = init_resources (argc, argv);
480
481#ifdef KEYSYM_RESOURCE
482 keyboard->register_done ();
483#endif
484
485#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */
488#endif
489
490 pty = ptytty::create ();
491
492 create_windows (argc, argv);
493
494 init_xlocale ();
495
496 scr_reset (); // initialize screen
497
498#if 0
499 XSynchronize (dpy, True);
500#endif
501
502#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */
505#endif
506#ifdef TRANSPARENT
507 if (OPTION (Opt_transparent))
508 {
509 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root);
512 }
513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
517
518 set_colorfgbg ();
519
520 init_command (cmd_argv);
521
522 free (cmd_argv);
523
524 if (pty->pty >= 0)
525 pty_ev.start (pty->pty, EVENT_READ);
526
527 check_ev.start ();
528
529 HOOK_INVOKE ((this, HOOK_START, DT_END));
530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
543
544 return true;
545}
546
547static struct sig_handlers 452static struct sig_handlers
548{ 453{
549 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
550 455
551 /* 456 /*
552 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
553 */ 458 */
554 void 459 void sig_term (ev::sig &w, int revents);
555 sig_term (sig_watcher &w) 460
461 sig_handlers ()
556 { 462 {
557 rxvt_emergency_cleanup (); 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
558 signal (w.signum, SIG_DFL);
559 kill (getpid (), w.signum);
560 }
561
562 sig_handlers ()
563 : sw_term (this, &sig_handlers::sig_term),
564 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565 {
566 } 465 }
567} sig_handlers; 466} sig_handlers;
568 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
569char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
570 477
571void 478void
572rxvt_init () 479rxvt_init ()
573{ 480{
574 ptytty::init (); 481 ptytty::init ();
482
483 if (!ev_default_loop (0))
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575 485
576 rxvt_environ = environ; 486 rxvt_environ = environ;
577 487
578 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
579 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
580 490
581 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
583 493
584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
585 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
586 496
587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
589 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
590 500
591 XrmInitialize (); 501 XrmInitialize ();
592} 502}
593 503
594/* ------------------------------------------------------------------------- *
595 * MEMORY ALLOCATION WRAPPERS *
596 * ------------------------------------------------------------------------- */
597void *
598rxvt_malloc (size_t size)
599{
600 void *p = malloc (size);
601
602 if (!p)
603 rxvt_fatal ("memory allocation failure. aborting.\n");
604
605 return p;
606}
607
608void *
609rxvt_calloc (size_t number, size_t size)
610{
611 void *p = calloc (number, size);
612
613 if (!p)
614 rxvt_fatal ("memory allocation failure. aborting.\n");
615
616 return p;
617}
618
619void *
620rxvt_realloc (void *ptr, size_t size)
621{
622 void *p = realloc (ptr, size);
623
624 if (!p)
625 rxvt_fatal ("memory allocation failure. aborting.\n");
626
627 return p;
628}
629
630/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
631/* 505/*
632 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
634 */ 508 */
635void 509void
636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 511{
638 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
639 int x, y, sb_w, flags; 513 int x, y, flags;
640 unsigned int w, h; 514 unsigned int w, h;
641 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
642 516
643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
644 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
654 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
655 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
656 530
657 if (flags & WidthValue) 531 if (flags & WidthValue)
658 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
659 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
660 szHint.flags |= USSize; 537 szHint.flags |= USSize;
661 } 538 }
662 539
663 if (flags & HeightValue) 540 if (flags & HeightValue)
664 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
665 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
666 szHint.flags |= USSize; 546 szHint.flags |= USSize;
667 } 547 }
668 548
669 if (flags & XValue) 549 if (flags & XValue)
670 { 550 {
701 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
702 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
703 583
704 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
705 585
706 sb_w = 0;
707 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
708 587
709 if (scrollBar.state) 588 if (scrollBar.state)
710 { 589 {
711 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
712 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
713 592
714 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 594 window_vt_x += sb_w;
716 } 595 }
717 596
718 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
740 { 619 {
741 min_it (height, max_height); 620 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
743 } 622 }
744 623
745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w;
747
748 if (recalc_x) 624 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 626
751 if (recalc_y) 627 if (recalc_y)
752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
753 629
754 ncol = width / fwidth; 630 ncol = width / fwidth;
755 nrow = height / fheight; 631 nrow = height / fheight;
756} 632}
757 633
758/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
759/* 635/*
770 646
771 ws.ws_col = ncol; 647 ws.ws_col = ncol;
772 ws.ws_row = nrow; 648 ws.ws_row = nrow;
773 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
774 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
776 652
777#if 0 653#if 0
778 // TIOCSWINSZ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
779 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
780 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
781#endif 657#endif
782} 658}
783 659
812 delete fontset[0]; 688 delete fontset[0];
813 fontset[0] = fs; 689 fontset[0] = fs;
814 690
815 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
816 prop.height += lineSpace; 692 prop.height += lineSpace;
693 prop.width += letterSpace;
817 694
818 fs->set_prop (prop, false); 695 fs->set_prop (prop, false);
819 696
820 fwidth = prop.width; 697 fwidth = prop.width;
821 fheight = prop.height; 698 fheight = prop.height;
857 if (parent[0]) 734 if (parent[0])
858 { 735 {
859 resize_all_windows (0, 0, 0); 736 resize_all_windows (0, 0, 0);
860 scr_remap_chars (); 737 scr_remap_chars ();
861 scr_touch (true); 738 scr_touch (true);
862 } 739 }
863 740
864 return true; 741 return true;
865} 742}
866 743
744void
867void rxvt_term::set_string_property (Atom prop, const char *str, int len) 745rxvt_term::set_string_property (Atom prop, const char *str, int len)
868{ 746{
869 XChangeProperty (dpy, parent[0], 747 XChangeProperty (dpy, parent[0],
870 prop, XA_STRING, 8, PropModeReplace, 748 prop, XA_STRING, 8, PropModeReplace,
871 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 749 (const unsigned char *)str, len >= 0 ? len : strlen (str));
872} 750}
873 751
752void
874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 753rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
875{ 754{
876 wchar_t *ws = rxvt_mbstowcs (str, len); 755 wchar_t *ws = rxvt_mbstowcs (str, len);
877 char *s = rxvt_wcstoutf8 (ws); 756 char *s = rxvt_wcstoutf8 (ws);
878 757
879 XChangeProperty (dpy, parent[0], 758 XChangeProperty (dpy, parent[0],
903#if ENABLE_EWMH 782#if ENABLE_EWMH
904 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 783 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
905#endif 784#endif
906} 785}
907 786
787void
788rxvt_term::set_window_color (int idx, const char *color)
789{
908#ifdef XTERM_COLOR_CHANGE 790#ifdef XTERM_COLOR_CHANGE
909void
910rxvt_term::set_window_color (int idx, const char *color)
911{
912 rxvt_color xcol; 791 rxvt_color xcol;
913 int i; 792
914
915 if (color == NULL || *color == '\0') 793 if (color == NULL || *color == '\0')
916 return; 794 return;
917 795
918 color = strdup (color); 796 color = strdup (color);
919 allocated.push_back ((void *)color); 797 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color; 798 rs[Rs_color + idx] = color;
921 799
922 /* handle color aliases */ 800 /* handle color aliases */
923 if (isdigit (*color)) 801 if (isdigit (*color))
924 { 802 {
925 i = atoi (color); 803 int i = atoi (color);
926 804
927 if (i >= 8 && i <= 15) 805 if (i >= 8 && i <= 15)
806 {
928 { /* bright colors */ 807 /* bright colors */
929 i -= 8;
930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 808 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
931 goto done; 809 goto done;
932 } 810 }
933 811
934 if (i >= 0 && i <= 7) 812 if (i >= 0 && i <= 7)
813 {
935 { /* normal colors */ 814 /* normal colors */
936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 815 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
937 goto done; 816 goto done;
938 } 817 }
939 } 818 }
940 819
945 * so just keep gobbling up the colormap 824 * so just keep gobbling up the colormap
946 */ 825 */
947 826
948 pix_colors_focused[idx] = xcol; 827 pix_colors_focused[idx] = xcol;
949 828
950 /* XSetWindowAttributes attr; */
951 /* Cursor cursor; */
952done: 829done:
953 /*TODO: handle Color_BD, scrollbar background, etc. */ 830 /*TODO: handle Color_BD, scrollbar background, etc. */
954 831
955 update_fade_color (idx); 832 update_fade_color (idx);
956 recolour_cursor (); 833 recolour_cursor ();
957 scr_recolour (); 834 scr_recolour ();
835#endif /* XTERM_COLOR_CHANGE */
958} 836}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 837
964void 838void
965rxvt_term::recolour_cursor () 839rxvt_term::recolour_cursor ()
966{ 840{
967 XColor fg, bg; 841 XColor fg, bg;
983 */ 857 */
984void 858void
985rxvt_term::set_colorfgbg () 859rxvt_term::set_colorfgbg ()
986{ 860{
987 unsigned int i; 861 unsigned int i;
988 const char *xpmb = "\0"; 862 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 863 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 864
991 strcpy (fstr, "default"); 865 strcpy (fstr, "default");
992 strcpy (bstr, "default"); 866 strcpy (bstr, "default");
993 for (i = Color_Black; i <= Color_White; i++) 867 for (i = Color_Black; i <= Color_White; i++)
999 873
1000 for (i = Color_Black; i <= Color_White; i++) 874 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 875 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 876 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 877 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 878#ifdef BG_IMAGE_FROM_FILE
1005 xpmb = "default;"; 879 xpmb = "default;";
1006#endif 880#endif
1007 break; 881 break;
1008 } 882 }
1009 883
1038 int old_width = szHint.width; 912 int old_width = szHint.width;
1039 int old_height = szHint.height; 913 int old_height = szHint.height;
1040 914
1041 window_calc (newwidth, newheight); 915 window_calc (newwidth, newheight);
1042 916
1043 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);
1044 XSetWMNormalHints (dpy, parent[0], &szHint); 923 XSetWMNormalHints (dpy, parent[0], &szHint);
924 szHint.flags |= PBaseSize | PResizeInc;
925 }
1045 926
1046 if (!ignoreparent) 927 if (!ignoreparent)
1047 { 928 {
1048#ifdef SMART_RESIZE 929#ifdef SMART_RESIZE
1049 /* 930 /*
1089#else 970#else
1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 971 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1091#endif 972#endif
1092 } 973 }
1093 974
975 if (set_hint)
976 XSetWMNormalHints (dpy, parent[0], &szHint);
977
1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1095 979
1096 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1097 { 981 {
1098 if (scrollBar.state) 982 if (scrollBar.state)
1099 { 983 scrollBar.resize ();
1100 XMoveResizeWindow (dpy, scrollBar.win,
1101 window_sb_x, 0,
1102 scrollbar_TotalWidth (), szHint.height);
1103 resize_scrollbar ();
1104 }
1105 984
1106 XMoveResizeWindow (dpy, vt, 985 XMoveResizeWindow (dpy, vt,
1107 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1108 width, height); 987 width, height);
1109 988
1110 scr_clear (); 989#ifdef HAVE_BG_PIXMAP
1111#ifdef XPM_BACKGROUND 990 if (bgPixmap.window_size_sensitive ())
1112 resize_pixmap (); 991 update_background ();
1113#endif 992#endif
1114 } 993 }
1115 994
1116 if (fix_screen || old_height == 0) 995 if (fix_screen || old_height == 0)
1117 scr_reset (); 996 scr_reset ();
1118 997
1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1120 //scr_touch (false); 999 //scr_touch (false);
1121 1000
1122#ifdef XPM_BACKGROUND 1001#ifdef HAVE_BG_PIXMAP
1123 if (pixmap) 1002// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1003// if (bgPixmap.pixmap)
1124 scr_touch (false); 1004// scr_touch (false);
1125#endif 1005#endif
1126 1006
1127#ifdef USE_XIM 1007#ifdef USE_XIM
1128 IMSetPosition (); 1008 IMSetPosition ();
1129#endif 1009#endif
1196 1076
1197/* Checking whether input method is running. */ 1077/* Checking whether input method is running. */
1198bool 1078bool
1199rxvt_term::IMisRunning () 1079rxvt_term::IMisRunning ()
1200{ 1080{
1201 char *p;
1202 Atom atom; 1081 Atom atom;
1203 Window win; 1082 Window win;
1204 char server[IMBUFSIZ]; 1083 char server[IMBUFSIZ];
1205 1084
1206 /* get current locale modifier */ 1085 /* get current locale modifier */
1207 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1086 if (char *p = XSetLocaleModifiers (0))
1208 { 1087 {
1209 strcpy (server, "@server="); 1088 strcpy (server, "@server=");
1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1089 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1211 1090
1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1091 if (p = strchr (server + 1, '@')) /* first one only */
1213 *p = '\0'; 1092 *p = '\0';
1214 1093
1215 atom = XInternAtom (dpy, server, False); 1094 atom = XInternAtom (dpy, server, False);
1216 win = XGetSelectionOwner (dpy, atom); 1095 win = XGetSelectionOwner (dpy, atom);
1217 1096
1300 if (term->rs[Rs_imLocale]) 1179 if (term->rs[Rs_imLocale])
1301 SET_LOCALE (term->locale); 1180 SET_LOCALE (term->locale);
1302 } 1181 }
1303 else 1182 else
1304 str = (void *)text->string.wide_char; 1183 str = (void *)text->string.wide_char;
1305 1184
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1185 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret, 1186 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first, 1187 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length, 1188 DT_INT, call_data->chg_length,
1310 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,
1629 1508
1630 if (input_style & XIMPreeditPosition) 1509 if (input_style & XIMPreeditPosition)
1631 { 1510 {
1632 im_set_size (preedit_rect); 1511 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1512 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 1513
1635 XSetICValues (Input_Context, 1514 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL); 1515 XNPreeditAttributes, preedit_attr, NULL);
1637 } 1516 }
1638 else 1517 else
1639 { 1518 {
1656 XFree (status_attr); 1535 XFree (status_attr);
1657 } 1536 }
1658 1537
1659 XFree (preedit_attr); 1538 XFree (preedit_attr);
1660} 1539}
1661#endif /* USE_XIM */ 1540#endif /* USE_XIM */
1541
1542void
1543rxvt_term::get_window_origin (int &x, int &y)
1544{
1545 Window cr;
1546 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1547/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1548}
1549
1550Pixmap
1551rxvt_term::get_pixmap_property (int prop_id)
1552{
1553 if (prop_id > 0 && prop_id < NUM_XA)
1554 if (xa[prop_id])
1555 {
1556 int aformat;
1557 unsigned long nitems, bytes_after;
1558 Atom atype;
1559 unsigned char *prop = NULL;
1560 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1561 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1562 &nitems, &bytes_after, &prop);
1563 if (result == Success && prop && atype == XA_PIXMAP)
1564 return *(Pixmap *)prop;
1565 }
1566
1567 return None;
1568}
1569
1570#ifdef HAVE_BG_PIXMAP
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
1582rxvt_term::update_background ()
1583{
1584 if (update_background_ev.is_active ())
1585 return;
1586
1587 bgPixmap.invalidate ();
1588
1589 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1590
1591 if (to_wait <= 0.)
1592 bgPixmap.render ();
1593 else
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
1602 update_background_ev.stop ();
1603 bgPixmap.render ();
1604 refresh_check ();
1605}
1606
1607#endif /* HAVE_BG_PIXMAP */
1662 1608
1663/*----------------------- end-of-file (C source) -----------------------*/ 1609/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines