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.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.317 by root, Tue May 12 08:21:56 2009 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
220 if (display) 239 if (display)
221 { 240 {
222 selection_clear (); 241 selection_clear ();
223 242
224#ifdef USE_XIM 243#ifdef USE_XIM
225 im_destroy (); 244 im_destroy ();
226#endif 245#endif
227#ifdef XTERM_SCROLLBAR 246 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); 247 if (gc) XFreeGC (dpy, gc);
252 248
253 delete drawable; 249 delete drawable;
254 // destroy all windows 250 // destroy all windows
255 if (parent[0]) 251 if (parent[0])
… …
263 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
264#endif 260#endif
265 } 261 }
266 262
267 clear (); 263 clear ();
268 }
269 264
270 delete pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
271#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused;
273#endif
274
275 displays.put (display); 266 displays.put (display);
267 }
276 268
277 scr_release (); 269 scr_release ();
278 270
279 /* clear all resources */ 271 /* clear all resources */
280 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
… …
292 delete argv; 284 delete argv;
293 285
294#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
295 delete keyboard; 287 delete keyboard;
296#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
297} 292}
298 293
299// child has exited, usually destroys 294// child has exited, usually destroys
300void 295void
301rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
302{ 297{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 299
305 cmd_pid = 0; 300 cmd_pid = 0;
306 301
307 if (!OPTION (Opt_hold)) 302 if (!option (Opt_hold))
308 destroy (); 303 destroy ();
309} 304}
310 305
311void 306void
312rxvt_term::destroy () 307rxvt_term::destroy ()
313{ 308{
314 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
315 return; 310 return;
316 311
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318 313
319#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
… …
323 if (display) 318 if (display)
324 { 319 {
325#if USE_XIM 320#if USE_XIM
326 im_ev.stop (display); 321 im_ev.stop (display);
327#endif 322#endif
328#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
330#endif 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
331#if TRANSPARENT
332 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
333#endif 326#endif
334 incr_ev.stop (); 327 incr_ev.stop ();
335 termwin_ev.stop (display); 328 termwin_ev.stop (display);
336 vt_ev.stop (display); 329 vt_ev.stop (display);
337 } 330 }
338 331
339 check_ev.stop (); 332 flush_ev.stop ();
340 pty_ev.stop (); 333 pty_ev.stop ();
341#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
343#endif 336#endif
344#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
352#endif 345#endif
353#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
354 pointer_ev.stop (); 347 pointer_ev.stop ();
355#endif 348#endif
356 349
357 destroy_ev.start (0); 350 destroy_ev.start ();
358} 351}
359 352
360void 353void
361rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 355{
363 make_current (); 356 make_current ();
364 357
365 delete this; 358 delete this;
366} 359}
… …
420 else 413 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 415 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 417 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 419 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 421}
429#endif 422#endif
430 423
… …
454 DisplayString (display)); 447 DisplayString (display));
455 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
456 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
457} 450}
458 451
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 452static struct sig_handlers
540{ 453{
541 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
542 455
543 /* 456 /*
544 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
545 */ 458 */
546 void 459 void sig_term (ev::sig &w, int revents);
547 sig_term (sig_watcher &w) 460
461 sig_handlers ()
548 { 462 {
549 rxvt_emergency_cleanup (); 463 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) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
557 {
558 } 465 }
559} sig_handlers; 466} sig_handlers;
560 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
561char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
562 477
563void 478void
564rxvt_init () 479rxvt_init ()
565{ 480{
566 ptytty::init (); 481 ptytty::init ();
482
483 if (!ev_default_loop (0))
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
567 485
568 rxvt_environ = environ; 486 rxvt_environ = environ;
569 487
570 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
572 490
573 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
575 493
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
578 496
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
581 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
582 500
583 XrmInitialize (); 501 XrmInitialize ();
584} 502}
585 503
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/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
623/* 505/*
624 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
626 */ 508 */
627void 509void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 511{
630 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
631 int x, y, sb_w, flags; 513 int x, y, flags;
632 unsigned int w, h; 514 unsigned int w, h;
633 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
634 516
635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
636 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
… …
646 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
647 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
648 530
649 if (flags & WidthValue) 531 if (flags & WidthValue)
650 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
651 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 537 szHint.flags |= USSize;
653 } 538 }
654 539
655 if (flags & HeightValue) 540 if (flags & HeightValue)
656 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
657 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
658 szHint.flags |= USSize; 546 szHint.flags |= USSize;
659 } 547 }
660 548
661 if (flags & XValue) 549 if (flags & XValue)
662 { 550 {
… …
693 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
694 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
695 583
696 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
697 585
698 sb_w = 0;
699 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
700 587
701 if (scrollBar.state) 588 if (scrollBar.state)
702 { 589 {
703 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
704 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
705 592
706 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 594 window_vt_x += sb_w;
708 } 595 }
709 596
710 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
… …
732 { 619 {
733 min_it (height, max_height); 620 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
735 } 622 }
736 623
737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w;
739
740 if (recalc_x) 624 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 626
743 if (recalc_y) 627 if (recalc_y)
744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
745 629
746 ncol = width / fwidth; 630 ncol = width / fwidth;
747 nrow = height / fheight; 631 nrow = height / fheight;
748} 632}
749 633
750/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
751/* 635/*
… …
762 646
763 ws.ws_col = ncol; 647 ws.ws_col = ncol;
764 ws.ws_row = nrow; 648 ws.ws_row = nrow;
765 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
766 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
768 652
769#if 0 653#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
772 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
773#endif 657#endif
774} 658}
775 659
… …
804 delete fontset[0]; 688 delete fontset[0];
805 fontset[0] = fs; 689 fontset[0] = fs;
806 690
807 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 692 prop.height += lineSpace;
693
809 fs->set_prop (prop); 694 fs->set_prop (prop, false);
810 695
811 fwidth = prop.width; 696 fwidth = prop.width;
812 fheight = prop.height; 697 fheight = prop.height;
813 fbase = prop.ascent; 698 fbase = prop.ascent;
814 699
… …
823 { 708 {
824 fontset[style] = fs = new rxvt_fontset (this); 709 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 710 rxvt_fontprop prop2 = prop;
826 711
827 if (res) 712 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 713 {
714 fs->populate (res);
715 fs->set_prop (prop2, false);
716 }
829 else 717 else
830 { 718 {
831 res = fontset[0]->fontdesc; 719 fs->populate (fontset[0]->fontdesc);
832 720
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 721 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; 722 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
723
724 fs->set_prop (prop2, true);
835 } 725 }
836 726
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 727 }
840#else 728#else
841 fontset[style] = fontset[0]; 729 fontset[style] = fontset[0];
842#endif 730#endif
843 } 731 }
… …
845 if (parent[0]) 733 if (parent[0])
846 { 734 {
847 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 736 scr_remap_chars ();
849 scr_touch (true); 737 scr_touch (true);
850 } 738 }
851 739
852 return true; 740 return true;
853} 741}
854 742
743void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 745{
857 XChangeProperty (dpy, parent[0], 746 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 749}
861 750
751void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 753{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
866 756
867 XChangeProperty (dpy, parent[0], 757 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 781#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 783#endif
894} 784}
895 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
896#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 790 rxvt_color xcol;
901 int i; 791
902
903 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
904 return; 793 return;
905 794
906 color = strdup (color); 795 color = strdup (color);
907 allocated.push_back ((void *)color); 796 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color; 797 rs[Rs_color + idx] = color;
909 798
910 /* handle color aliases */ 799 /* handle color aliases */
911 if (isdigit (*color)) 800 if (isdigit (*color))
912 { 801 {
913 i = atoi (color); 802 int i = atoi (color);
914 803
915 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
916 { /* bright colors */ 806 /* bright colors */
917 i -= 8;
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
919 goto done; 808 goto done;
920 } 809 }
921 810
922 if (i >= 0 && i <= 7) 811 if (i >= 0 && i <= 7)
812 {
923 { /* normal colors */ 813 /* normal colors */
924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
925 goto done; 815 goto done;
926 } 816 }
927 } 817 }
928 818
… …
933 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
934 */ 824 */
935 825
936 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
937 827
938 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */
940done: 828done:
941
942#if OFF_FOCUS_FADING
943 if (rs[Rs_fade])
944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
949#endif
950
951 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
952 830
831 update_fade_color (idx);
953 recolour_cursor (); 832 recolour_cursor ();
954 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
955} 835}
956
957#else
958# define set_window_color (idx,color) ((void)0)
959#endif /* XTERM_COLOR_CHANGE */
960 836
961void 837void
962rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
963{ 839{
964 XColor fg, bg; 840 XColor fg, bg;
… …
980 */ 856 */
981void 857void
982rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
983{ 859{
984 unsigned int i; 860 unsigned int i;
985 const char *xpmb = "\0"; 861 const char *xpmb = "";
986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
987 863
988 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
989 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
990 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
… …
996 872
997 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
998 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
999 { 875 {
1000 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
1001#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
1002 xpmb = "default;"; 878 xpmb = "default;";
1003#endif 879#endif
1004 break; 880 break;
1005 } 881 }
1006 882
… …
1035 int old_width = szHint.width; 911 int old_width = szHint.width;
1036 int old_height = szHint.height; 912 int old_height = szHint.height;
1037 913
1038 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
1039 915
1040 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);
1041 XSetWMNormalHints (dpy, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1042 925
1043 if (!ignoreparent) 926 if (!ignoreparent)
1044 { 927 {
1045#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1046 /* 929 /*
… …
1086#else 969#else
1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1088#endif 971#endif
1089 } 972 }
1090 973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
976
1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1092 978
1093 if (fix_screen || newwidth != old_width || newheight != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1094 { 980 {
1095 if (scrollBar.state) 981 if (scrollBar.state)
1096 { 982 scrollBar.resize ();
1097 XMoveResizeWindow (dpy, scrollBar.win,
1098 window_sb_x, 0,
1099 scrollbar_TotalWidth (), szHint.height);
1100 resize_scrollbar ();
1101 }
1102 983
1103 XMoveResizeWindow (dpy, vt, 984 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1105 width, height); 986 width, height);
1106 987
1107 scr_clear (); 988#ifdef HAVE_BG_PIXMAP
1108#ifdef XPM_BACKGROUND 989 if (bgPixmap.window_size_sensitive ())
1109 resize_pixmap (); 990 update_background ();
1110#endif 991#endif
1111 } 992 }
1112 993
1113 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
1114 scr_reset (); 995 scr_reset ();
1115 996
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 997 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false); 998 //scr_touch (false);
1118 999
1119#ifdef XPM_BACKGROUND 1000#ifdef HAVE_BG_PIXMAP
1120 if (pixmap) 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002// if (bgPixmap.pixmap)
1121 scr_touch (false); 1003// scr_touch (false);
1122#endif 1004#endif
1123 1005
1124#ifdef USE_XIM 1006#ifdef USE_XIM
1125 IMSetPosition (); 1007 IMSetPosition ();
1126#endif 1008#endif
… …
1193 1075
1194/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1195bool 1077bool
1196rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1197{ 1079{
1198 char *p;
1199 Atom atom; 1080 Atom atom;
1200 Window win; 1081 Window win;
1201 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1202 1083
1203 /* get current locale modifier */ 1084 /* get current locale modifier */
1204 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1205 { 1086 {
1206 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1208 1089
1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1210 *p = '\0'; 1091 *p = '\0';
1211 1092
1212 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1213 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1214 1095
… …
1297 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1299 } 1180 }
1300 else 1181 else
1301 str = (void *)text->string.wide_char; 1182 str = (void *)text->string.wide_char;
1302 1183
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1188 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1626 1507
1627 if (input_style & XIMPreeditPosition) 1508 if (input_style & XIMPreeditPosition)
1628 { 1509 {
1629 im_set_size (preedit_rect); 1510 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 1512
1632 XSetICValues (Input_Context, 1513 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL); 1514 XNPreeditAttributes, preedit_attr, NULL);
1634 } 1515 }
1635 else 1516 else
1636 { 1517 {
… …
1653 XFree (status_attr); 1534 XFree (status_attr);
1654 } 1535 }
1655 1536
1656 XFree (preedit_attr); 1537 XFree (preedit_attr);
1657} 1538}
1658#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1540
1541void
1542rxvt_term::get_window_origin (int &x, int &y)
1543{
1544 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547}
1548
1549Pixmap
1550rxvt_term::get_pixmap_property (int prop_id)
1551{
1552 if (prop_id > 0 && prop_id < NUM_XA)
1553 if (xa[prop_id])
1554 {
1555 int aformat;
1556 unsigned long nitems, bytes_after;
1557 Atom atype;
1558 unsigned char *prop = NULL;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP)
1563 return *(Pixmap *)prop;
1564 }
1565
1566 return None;
1567}
1568
1569#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579
1580void
1581rxvt_term::update_background ()
1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1586 bgPixmap.invalidate ();
1587
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1589
1590 if (to_wait <= 0.)
1591 bgPixmap.render ();
1592 else
1593 update_background_ev.start (to_wait);
1594}
1595
1596void
1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1602 bgPixmap.render ();
1603 refresh_check ();
1604}
1605
1606#endif /* HAVE_BG_PIXMAP */
1659 1607
1660/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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