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.225 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 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"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
154#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
155 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);
156#endif 161#endif
157#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
158 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);
159#endif 164#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 167#endif
163#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 170#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 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),
168#endif 180#endif
169#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 183#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 184#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 186#endif
178 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 194
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 196
189 termlist.push_back (this); 197 termlist.push_back (this);
190 198
191#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
193#endif 201#endif
194} 202}
195 203
196// 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.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
203 pty_ev.stop (); 212 pty_ev.stop ();
… …
215 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
216 delete fontset[i]; 225 delete fontset[i];
217#endif 226#endif
218 delete fontset[0]; 227 delete fontset[0];
219 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
220 if (display) 233 if (display)
221 { 234 {
222 selection_clear (); 235 selection_clear ();
223 236
224#ifdef USE_XIM 237#ifdef USE_XIM
225 im_destroy (); 238 im_destroy ();
226#endif 239#endif
227#ifdef XTERM_SCROLLBAR 240 scrollBar.destroy ();
228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
230#endif
231#ifdef PLAIN_SCROLLBAR
232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233#endif
234#ifdef NEXT_SCROLLBAR
235 if (blackGC) XFreeGC (dpy, blackGC);
236 if (whiteGC) XFreeGC (dpy, whiteGC);
237 if (grayGC) XFreeGC (dpy, grayGC);
238 if (darkGC) XFreeGC (dpy, darkGC);
239 if (stippleGC) XFreeGC (dpy, stippleGC);
240 if (dimple) XFreePixmap (dpy, dimple);
241 if (upArrow) XFreePixmap (dpy, upArrow);
242 if (downArrow) XFreePixmap (dpy, downArrow);
243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245#endif
246#ifdef RXVT_SCROLLBAR
247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250#endif
251 if (gc) XFreeGC (dpy, gc); 241 if (gc) XFreeGC (dpy, gc);
252 242
253 delete drawable; 243 delete drawable;
254 // destroy all windows 244 // destroy all windows
255 if (parent[0]) 245 if (parent[0])
… …
263 pix_colors_unfocused [i].free (this); 253 pix_colors_unfocused [i].free (this);
264#endif 254#endif
265 } 255 }
266 256
267 clear (); 257 clear ();
268 }
269 258
270 delete pix_colors_focused; 259 display->flush (); /* ideally .put should do this */
271#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused;
273#endif
274
275 displays.put (display); 260 displays.put (display);
261 }
276 262
277 scr_release (); 263 scr_release ();
278 264
279 /* clear all resources */ 265 /* clear all resources */
280 for (int i = 0; i < allocated.size (); i++) 266 for (int i = 0; i < allocated.size (); i++)
… …
292 delete argv; 278 delete argv;
293 279
294#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
295 delete keyboard; 281 delete keyboard;
296#endif 282#endif
283#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db);
285#endif
297} 286}
298 287
299// child has exited, usually destroys 288// child has exited, usually destroys
300void 289void
301rxvt_term::child_cb (child_watcher &w, int status) 290rxvt_term::child_cb (ev::child &w, int status)
302{ 291{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 292 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 293
305 cmd_pid = 0; 294 cmd_pid = 0;
306 295
307 if (!OPTION (Opt_hold)) 296 if (!option (Opt_hold))
308 destroy (); 297 destroy ();
309} 298}
310 299
311void 300void
312rxvt_term::destroy () 301rxvt_term::destroy ()
313{ 302{
314 if (destroy_ev.active) 303 if (destroy_ev.is_active ())
315 return; 304 return;
316 305
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 306 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318 307
319#if ENABLE_OVERLAY 308#if ENABLE_OVERLAY
… …
323 if (display) 312 if (display)
324 { 313 {
325#if USE_XIM 314#if USE_XIM
326 im_ev.stop (display); 315 im_ev.stop (display);
327#endif 316#endif
328#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
330#endif 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
331#if TRANSPARENT
332 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
333#endif 320#endif
334 incr_ev.stop (); 321 incr_ev.stop ();
335 termwin_ev.stop (display); 322 termwin_ev.stop (display);
336 vt_ev.stop (display); 323 vt_ev.stop (display);
337 } 324 }
338 325
339 check_ev.stop (); 326 flush_ev.stop ();
340 pty_ev.stop (); 327 pty_ev.stop ();
341#ifdef CURSOR_BLINK 328#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 329 cursor_blink_ev.stop ();
343#endif 330#endif
344#ifdef TEXT_BLINK 331#ifdef TEXT_BLINK
… …
352#endif 339#endif
353#ifdef POINTER_BLANK 340#ifdef POINTER_BLANK
354 pointer_ev.stop (); 341 pointer_ev.stop ();
355#endif 342#endif
356 343
357 destroy_ev.start (0); 344 destroy_ev.start ();
358} 345}
359 346
360void 347void
361rxvt_term::destroy_cb (time_watcher &w) 348rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 349{
363 make_current (); 350 make_current ();
364 351
365 delete this; 352 delete this;
366} 353}
… …
420 else 407 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 409 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 411 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 412 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 413 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 415}
429#endif 416#endif
430 417
… …
454 DisplayString (display)); 441 DisplayString (display));
455 rxvt_emergency_cleanup (); 442 rxvt_emergency_cleanup ();
456 _exit (EXIT_FAILURE); 443 _exit (EXIT_FAILURE);
457} 444}
458 445
459/*----------------------------------------------------------------------*/
460bool
461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
462{
463 this->envv = envv;
464
465 SET_R (this);
466 set_locale ("");
467 set_environ (envv); // few things in X do not call setlocale :(
468
469 if (!init_vars ())
470 return false;
471
472 init_secondary ();
473
474 const char **cmd_argv = init_resources (argc, argv);
475
476#ifdef KEYSYM_RESOURCE
477 keyboard->register_done ();
478#endif
479
480#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */
483#endif
484
485 pty = ptytty::create ();
486
487 create_windows (argc, argv);
488
489 init_xlocale ();
490
491 scr_reset (); // initialize screen
492
493#if 0
494 XSynchronize (dpy, True);
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */
500#endif
501#ifdef TRANSPARENT
502 if (OPTION (Opt_transparent))
503 {
504 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root);
507 }
508#endif
509
510 set_colorfgbg ();
511
512 init_command (cmd_argv);
513
514 free (cmd_argv);
515
516 if (pty->pty >= 0)
517 pty_ev.start (pty->pty, EVENT_READ);
518
519 check_ev.start ();
520
521 HOOK_INVOKE ((this, HOOK_START, DT_END));
522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
533 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]);
535
536 return true;
537}
538
539static struct sig_handlers 446static struct sig_handlers
540{ 447{
541 sig_watcher sw_term, sw_int; 448 ev::sig sw_term, sw_int;
542 449
543 /* 450 /*
544 * Catch a fatal signal and tidy up before quitting 451 * Catch a fatal signal and tidy up before quitting
545 */ 452 */
546 void 453 void sig_term (ev::sig &w, int revents);
547 sig_term (sig_watcher &w) 454
455 sig_handlers ()
548 { 456 {
549 rxvt_emergency_cleanup (); 457 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
550 signal (w.signum, SIG_DFL);
551 kill (getpid (), w.signum);
552 }
553
554 sig_handlers ()
555 : sw_term (this, &sig_handlers::sig_term),
556 sw_int (this, &sig_handlers::sig_term) 458 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
557 {
558 } 459 }
559} sig_handlers; 460} sig_handlers;
560 461
462void
463sig_handlers::sig_term (ev::sig &w, int revents)
464{
465 rxvt_emergency_cleanup ();
466 w.stop ();
467 kill (getpid (), w.signum);
468}
469
561char **rxvt_environ; // startup environment 470char **rxvt_environ; // startup environment
562 471
563void 472void
564rxvt_init () 473rxvt_init ()
565{ 474{
566 ptytty::init (); 475 ptytty::init ();
476
477 if (!ev_default_loop (0))
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
567 479
568 rxvt_environ = environ; 480 rxvt_environ = environ;
569 481
570 signal (SIGHUP, SIG_IGN); 482 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 483 signal (SIGPIPE, SIG_IGN);
572 484
573 sig_handlers.sw_term.start (SIGTERM); 485 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 486 sig_handlers.sw_int.start (SIGINT); ev_unref ();
575 487
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 489 /* signal (SIGURG, SIG_DFL); */
578 490
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
581 XSetIOErrorHandler (rxvt_xioerror_handler); 493 XSetIOErrorHandler (rxvt_xioerror_handler);
582 494
583 XrmInitialize (); 495 XrmInitialize ();
584} 496}
585 497
586/* ------------------------------------------------------------------------- *
587 * MEMORY ALLOCATION WRAPPERS *
588 * ------------------------------------------------------------------------- */
589void *
590rxvt_malloc (size_t size)
591{
592 void *p = malloc (size);
593
594 if (!p)
595 rxvt_fatal ("memory allocation failure. aborting.\n");
596
597 return p;
598}
599
600void *
601rxvt_calloc (size_t number, size_t size)
602{
603 void *p = calloc (number, size);
604
605 if (!p)
606 rxvt_fatal ("memory allocation failure. aborting.\n");
607
608 return p;
609}
610
611void *
612rxvt_realloc (void *ptr, size_t size)
613{
614 void *p = realloc (ptr, size);
615
616 if (!p)
617 rxvt_fatal ("memory allocation failure. aborting.\n");
618
619 return p;
620}
621
622/*----------------------------------------------------------------------*/ 498/*----------------------------------------------------------------------*/
623/* 499/*
624 * window size/position calculcations for XSizeHint and other storage. 500 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 501 * if width/height are non-zero then override calculated width/height
626 */ 502 */
627void 503void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 504rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 505{
630 short recalc_x, recalc_y; 506 short recalc_x, recalc_y;
631 int x, y, sb_w, flags; 507 int x, y, flags;
632 unsigned int w, h; 508 unsigned int w, h;
633 unsigned int max_width, max_height; 509 unsigned int max_width, max_height;
634 510
635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 511 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
636 szHint.win_gravity = NorthWestGravity; 512 szHint.win_gravity = NorthWestGravity;
… …
646 if (rs[Rs_geometry]) 522 if (rs[Rs_geometry])
647 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 523 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
648 524
649 if (flags & WidthValue) 525 if (flags & WidthValue)
650 { 526 {
527 if (!w)
528 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
529
651 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 530 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 531 szHint.flags |= USSize;
653 } 532 }
654 533
655 if (flags & HeightValue) 534 if (flags & HeightValue)
656 { 535 {
536 if (!h)
537 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
538
657 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 539 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
658 szHint.flags |= USSize; 540 szHint.flags |= USSize;
659 } 541 }
660 542
661 if (flags & XValue) 543 if (flags & XValue)
662 { 544 {
… …
693 max_width = MAX_COLS * fwidth; 575 max_width = MAX_COLS * fwidth;
694 max_height = MAX_ROWS * fheight; 576 max_height = MAX_ROWS * fheight;
695 577
696 szHint.base_width = szHint.base_height = 2 * int_bwidth; 578 szHint.base_width = szHint.base_height = 2 * int_bwidth;
697 579
698 sb_w = 0;
699 window_vt_x = window_vt_y = int_bwidth; 580 window_vt_x = window_vt_y = int_bwidth;
700 581
701 if (scrollBar.state) 582 if (scrollBar.state)
702 { 583 {
703 sb_w = scrollbar_TotalWidth (); 584 int sb_w = scrollBar.total_width ();
704 szHint.base_width += sb_w; 585 szHint.base_width += sb_w;
705 586
706 if (!OPTION (Opt_scrollBar_right)) 587 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 588 window_vt_x += sb_w;
708 } 589 }
709 590
710 szHint.width_inc = fwidth; 591 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 592 szHint.height_inc = fheight;
… …
731 else 612 else
732 { 613 {
733 min_it (height, max_height); 614 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 615 szHint.height = szHint.base_height + height;
735 } 616 }
736
737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w;
739 617
740 if (recalc_x) 618 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 619 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 620
743 if (recalc_y) 621 if (recalc_y)
… …
765 ws.ws_xpixel = width; 643 ws.ws_xpixel = width;
766 ws.ws_ypixel = height; 644 ws.ws_ypixel = height;
767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 645 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
768 646
769#if 0 647#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 648 // TIOCSWINSZ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 649 if (cmd_pid) /* force through to the command */
772 kill (-cmd_pid, SIGWINCH); 650 kill (-cmd_pid, SIGWINCH);
773#endif 651#endif
774} 652}
775 653
… …
804 delete fontset[0]; 682 delete fontset[0];
805 fontset[0] = fs; 683 fontset[0] = fs;
806 684
807 prop = (*fs)[1]->properties (); 685 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 686 prop.height += lineSpace;
687
809 fs->set_prop (prop); 688 fs->set_prop (prop, false);
810 689
811 fwidth = prop.width; 690 fwidth = prop.width;
812 fheight = prop.height; 691 fheight = prop.height;
813 fbase = prop.ascent; 692 fbase = prop.ascent;
814 693
… …
823 { 702 {
824 fontset[style] = fs = new rxvt_fontset (this); 703 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 704 rxvt_fontprop prop2 = prop;
826 705
827 if (res) 706 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 707 {
708 fs->populate (res);
709 fs->set_prop (prop2, false);
710 }
829 else 711 else
830 { 712 {
831 res = fontset[0]->fontdesc; 713 fs->populate (fontset[0]->fontdesc);
832 714
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 715 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
834 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 716 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
717
718 fs->set_prop (prop2, true);
835 } 719 }
836 720
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 721 }
840#else 722#else
841 fontset[style] = fontset[0]; 723 fontset[style] = fontset[0];
842#endif 724#endif
843 } 725 }
… …
845 if (parent[0]) 727 if (parent[0])
846 { 728 {
847 resize_all_windows (0, 0, 0); 729 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 730 scr_remap_chars ();
849 scr_touch (true); 731 scr_touch (true);
850 } 732 }
851 733
852 return true; 734 return true;
853} 735}
854 736
737void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 738rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 739{
857 XChangeProperty (dpy, parent[0], 740 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 741 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 742 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 743}
861 744
745void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 746rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 747{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 748 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 749 char *s = rxvt_wcstoutf8 (ws);
866 750
867 XChangeProperty (dpy, parent[0], 751 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 775#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 776 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 777#endif
894} 778}
895 779
780void
781rxvt_term::set_window_color (int idx, const char *color)
782{
896#ifdef XTERM_COLOR_CHANGE 783#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 784 rxvt_color xcol;
901 int i; 785
902
903 if (color == NULL || *color == '\0') 786 if (color == NULL || *color == '\0')
904 return; 787 return;
905 788
906 color = strdup (color); 789 color = strdup (color);
907 allocated.push_back ((void *)color); 790 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color; 791 rs[Rs_color + idx] = color;
909 792
910 /* handle color aliases */ 793 /* handle color aliases */
911 if (isdigit (*color)) 794 if (isdigit (*color))
912 { 795 {
913 i = atoi (color); 796 int i = atoi (color);
914 797
915 if (i >= 8 && i <= 15) 798 if (i >= 8 && i <= 15)
799 {
916 { /* bright colors */ 800 /* bright colors */
917 i -= 8;
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 801 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
919 goto done; 802 goto done;
920 } 803 }
921 804
922 if (i >= 0 && i <= 7) 805 if (i >= 0 && i <= 7)
806 {
923 { /* normal colors */ 807 /* normal colors */
924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 808 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
925 goto done; 809 goto done;
926 } 810 }
927 } 811 }
928 812
… …
933 * so just keep gobbling up the colormap 817 * so just keep gobbling up the colormap
934 */ 818 */
935 819
936 pix_colors_focused[idx] = xcol; 820 pix_colors_focused[idx] = xcol;
937 821
938 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */
940done: 822done:
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 823 /*TODO: handle Color_BD, scrollbar background, etc. */
942 824
943 update_fade_color (idx); 825 update_fade_color (idx);
944 recolour_cursor (); 826 recolour_cursor ();
945 scr_recolour (); 827 scr_recolour ();
828#endif /* XTERM_COLOR_CHANGE */
946} 829}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 830
952void 831void
953rxvt_term::recolour_cursor () 832rxvt_term::recolour_cursor ()
954{ 833{
955 XColor fg, bg; 834 XColor fg, bg;
… …
971 */ 850 */
972void 851void
973rxvt_term::set_colorfgbg () 852rxvt_term::set_colorfgbg ()
974{ 853{
975 unsigned int i; 854 unsigned int i;
976 const char *xpmb = "\0"; 855 const char *xpmb = "";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 856 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
978 857
979 strcpy (fstr, "default"); 858 strcpy (fstr, "default");
980 strcpy (bstr, "default"); 859 strcpy (bstr, "default");
981 for (i = Color_Black; i <= Color_White; i++) 860 for (i = Color_Black; i <= Color_White; i++)
… …
987 866
988 for (i = Color_Black; i <= Color_White; i++) 867 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 868 if (pix_colors[Color_bg] == pix_colors[i])
990 { 869 {
991 sprintf (bstr, "%d", (i - Color_Black)); 870 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 871#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 872 xpmb = "default;";
994#endif 873#endif
995 break; 874 break;
996 } 875 }
997 876
… …
1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 961 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 962
1084 if (fix_screen || newwidth != old_width || newheight != old_height) 963 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 964 {
1086 if (scrollBar.state) 965 if (scrollBar.state)
1087 { 966 scrollBar.resize ();
1088 XMoveResizeWindow (dpy, scrollBar.win,
1089 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar ();
1092 }
1093 967
1094 XMoveResizeWindow (dpy, vt, 968 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 969 window_vt_x, window_vt_y,
1096 width, height); 970 width, height);
1097 971
972#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.window_size_sensitive ())
974 update_background ();
975#endif
976
1098 scr_clear (); 977 scr_clear ();
1099#ifdef XPM_BACKGROUND
1100 resize_pixmap ();
1101#endif
1102 } 978 }
1103 979
1104 if (fix_screen || old_height == 0) 980 if (fix_screen || old_height == 0)
1105 scr_reset (); 981 scr_reset ();
1106 982
1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 983 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 //scr_touch (false); 984 //scr_touch (false);
1109 985
1110#ifdef XPM_BACKGROUND 986#ifdef HAVE_BG_PIXMAP
1111 if (pixmap) 987// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
988// if (bgPixmap.pixmap)
1112 scr_touch (false); 989// scr_touch (false);
1113#endif 990#endif
1114 991
1115#ifdef USE_XIM 992#ifdef USE_XIM
1116 IMSetPosition (); 993 IMSetPosition ();
1117#endif 994#endif
… …
1288 if (term->rs[Rs_imLocale]) 1165 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->locale); 1166 SET_LOCALE (term->locale);
1290 } 1167 }
1291 else 1168 else
1292 str = (void *)text->string.wide_char; 1169 str = (void *)text->string.wide_char;
1293 1170
1294 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1171 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1295 DT_INT, call_data->caret, 1172 DT_INT, call_data->caret,
1296 DT_INT, call_data->chg_first, 1173 DT_INT, call_data->chg_first,
1297 DT_INT, call_data->chg_length, 1174 DT_INT, call_data->chg_length,
1298 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1175 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1617 1494
1618 if (input_style & XIMPreeditPosition) 1495 if (input_style & XIMPreeditPosition)
1619 { 1496 {
1620 im_set_size (preedit_rect); 1497 im_set_size (preedit_rect);
1621 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1498 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1622 1499
1623 XSetICValues (Input_Context, 1500 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, NULL); 1501 XNPreeditAttributes, preedit_attr, NULL);
1625 } 1502 }
1626 else 1503 else
1627 { 1504 {
… …
1644 XFree (status_attr); 1521 XFree (status_attr);
1645 } 1522 }
1646 1523
1647 XFree (preedit_attr); 1524 XFree (preedit_attr);
1648} 1525}
1649#endif /* USE_XIM */ 1526#endif /* USE_XIM */
1527
1528void
1529rxvt_term::get_window_origin (int &x, int &y)
1530{
1531 Window cr;
1532 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1533/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1534}
1535
1536Pixmap
1537rxvt_term::get_pixmap_property (int prop_id)
1538{
1539 if (prop_id > 0 && prop_id < NUM_XA)
1540 if (xa[prop_id])
1541 {
1542 int aformat;
1543 unsigned long nitems, bytes_after;
1544 Atom atype;
1545 unsigned char *prop = NULL;
1546 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1547 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1548 &nitems, &bytes_after, &prop);
1549 if (result == Success && prop && atype == XA_PIXMAP)
1550 return *(Pixmap *)prop;
1551 }
1552
1553 return None;
1554}
1555
1556#ifdef HAVE_BG_PIXMAP
1557# if TRACE_PIXMAPS
1558# undef update_background
1559void
1560rxvt_term::trace_update_background (const char *file, int line)
1561{
1562 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1563 update_background ();
1564}
1565# endif
1566
1567void
1568rxvt_term::update_background ()
1569{
1570 if (update_background_ev.is_active ())
1571 return;
1572
1573 bgPixmap.invalidate ();
1574
1575 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1576
1577 if (to_wait <= 0.)
1578 bgPixmap.render ();
1579 else
1580 update_background_ev.start (to_wait);
1581}
1582
1583void
1584rxvt_term::update_background_cb (ev::timer &w, int revents)
1585{
1586 make_current ();
1587
1588 update_background_ev.stop ();
1589 bgPixmap.render ();
1590 refresh_check ();
1591}
1592
1593#endif /* HAVE_BG_PIXMAP */
1650 1594
1651/*----------------------- end-of-file (C source) -----------------------*/ 1595/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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