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

Diff Legend

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