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

Diff Legend

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