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

Diff Legend

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