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.322 by root, Tue Mar 30 23:00:35 2010 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 ();
242 selection_clear (true);
222 243
223#ifdef USE_XIM 244#ifdef USE_XIM
224 im_destroy (); 245 im_destroy ();
225#endif 246#endif
226#ifdef XTERM_SCROLLBAR 247 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); 248 if (gc) XFreeGC (dpy, gc);
251 249
252 delete drawable; 250 delete drawable;
253 // destroy all windows 251 // destroy all windows
254 if (parent[0]) 252 if (parent[0])
… …
262 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
263#endif 261#endif
264 } 262 }
265 263
266 clear (); 264 clear ();
267 }
268 265
269 delete pix_colors_focused; 266 display->flush (); /* ideally .put should do this */
270#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused;
272#endif
273
274 displays.put (display); 267 displays.put (display);
268 }
275 269
276 scr_release (); 270 scr_release ();
277 271
278 /* clear all resources */ 272 /* clear all resources */
279 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
280 free (allocated [i]); 274 free (allocated [i]);
281 275
282 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
283 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
284 free (env_display); 279 free (env_display);
285 free (env_term); 280 free (env_term);
286 free (locale); 281 free (locale);
287 free (v_buffer); 282 free (v_buffer);
… …
291 delete argv; 286 delete argv;
292 287
293#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
294 delete keyboard; 289 delete keyboard;
295#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
296} 294}
297 295
298// child has exited, usually destroys 296// child has exited, usually destroys
299void 297void
300rxvt_term::child_cb (child_watcher &w, int status) 298rxvt_term::child_cb (ev::child &w, int status)
301{ 299{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 300 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 301
304 cmd_pid = 0; 302 cmd_pid = 0;
305 303
306 if (!OPTION (Opt_hold)) 304 if (!option (Opt_hold))
307 destroy (); 305 destroy ();
308} 306}
309 307
310void 308void
311rxvt_term::destroy () 309rxvt_term::destroy ()
312{ 310{
313 if (destroy_ev.active) 311 if (destroy_ev.is_active ())
314 return; 312 return;
315 313
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317 315
318#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
… …
322 if (display) 320 if (display)
323 { 321 {
324#if USE_XIM 322#if USE_XIM
325 im_ev.stop (display); 323 im_ev.stop (display);
326#endif 324#endif
327#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
329#endif 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
330#if TRANSPARENT
331 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
332#endif 328#endif
333 incr_ev.stop (); 329 incr_ev.stop ();
334 termwin_ev.stop (display); 330 termwin_ev.stop (display);
335 vt_ev.stop (display); 331 vt_ev.stop (display);
336 } 332 }
337 333
338 check_ev.stop (); 334 flush_ev.stop ();
339 pty_ev.stop (); 335 pty_ev.stop ();
340#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
341 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
342#endif 338#endif
343#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
351#endif 347#endif
352#ifdef POINTER_BLANK 348#ifdef POINTER_BLANK
353 pointer_ev.stop (); 349 pointer_ev.stop ();
354#endif 350#endif
355 351
356 destroy_ev.start (0); 352 destroy_ev.start ();
357} 353}
358 354
359void 355void
360rxvt_term::destroy_cb (time_watcher &w) 356rxvt_term::destroy_cb (ev::idle &w, int revents)
361{ 357{
362 make_current (); 358 make_current ();
363 359
364 delete this; 360 delete this;
365} 361}
… …
419 else 415 else
420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421 mesg, BUFSIZ); 417 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423 } 419 }
424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425 mesg, BUFSIZ); 421 mesg, BUFSIZ);
426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427} 423}
428#endif 424#endif
429 425
… …
453 DisplayString (display)); 449 DisplayString (display));
454 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
455 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
456} 452}
457 453
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 454static struct sig_handlers
539{ 455{
540 sig_watcher sw_term, sw_int; 456 ev::sig sw_term, sw_int;
541 457
542 /* 458 /*
543 * Catch a fatal signal and tidy up before quitting 459 * Catch a fatal signal and tidy up before quitting
544 */ 460 */
545 void 461 void sig_term (ev::sig &w, int revents);
546 sig_term (sig_watcher &w) 462
463 sig_handlers ()
547 { 464 {
548 rxvt_emergency_cleanup (); 465 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) 466 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
556 {
557 } 467 }
558} sig_handlers; 468} sig_handlers;
559 469
470void
471sig_handlers::sig_term (ev::sig &w, int revents)
472{
473 rxvt_emergency_cleanup ();
474 w.stop ();
475 kill (getpid (), w.signum);
476}
477
560char **rxvt_environ; // startup environment 478char **rxvt_environ; // startup environment
561 479
562void 480void
563rxvt_init () 481rxvt_init ()
564{ 482{
565 ptytty::init (); 483 ptytty::init ();
484
485 if (!ev_default_loop (0))
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
566 487
567 rxvt_environ = environ; 488 rxvt_environ = environ;
568 489
569 signal (SIGHUP, SIG_IGN); 490 signal (SIGHUP, SIG_IGN);
570 signal (SIGPIPE, SIG_IGN); 491 signal (SIGPIPE, SIG_IGN);
571 492
572 sig_handlers.sw_term.start (SIGTERM); 493 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
573 sig_handlers.sw_int.start (SIGINT); 494 sig_handlers.sw_int.start (SIGINT); ev_unref ();
574 495
575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
576 /* signal (SIGURG, SIG_DFL); */ 497 /* signal (SIGURG, SIG_DFL); */
577 498
578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
580 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
581 502
582 XrmInitialize (); 503 XrmInitialize ();
583} 504}
584 505
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/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
622/* 507/*
623 * window size/position calculcations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
625 */ 510 */
626void 511void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 513{
629 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
630 int x, y, sb_w, flags; 515 int x, y, flags;
631 unsigned int w, h; 516 unsigned int w, h;
632 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
633 518
634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
635 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
645 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
646 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
647 532
648 if (flags & WidthValue) 533 if (flags & WidthValue)
649 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
650 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
651 szHint.flags |= USSize; 539 szHint.flags |= USSize;
652 } 540 }
653 541
654 if (flags & HeightValue) 542 if (flags & HeightValue)
655 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
656 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
657 szHint.flags |= USSize; 548 szHint.flags |= USSize;
658 } 549 }
659 550
660 if (flags & XValue) 551 if (flags & XValue)
661 { 552 {
… …
692 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
693 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
694 585
695 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
696 587
697 sb_w = 0;
698 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
699 589
700 if (scrollBar.state) 590 if (scrollBar.state)
701 { 591 {
702 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
703 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
704 594
705 if (!OPTION (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 596 window_vt_x += sb_w;
707 } 597 }
708 598
709 szHint.width_inc = fwidth; 599 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 600 szHint.height_inc = fheight;
… …
731 { 621 {
732 min_it (height, max_height); 622 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
734 } 624 }
735 625
736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w;
738
739 if (recalc_x) 626 if (recalc_x)
740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 628
742 if (recalc_y) 629 if (recalc_y)
743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 631
745 ncol = width / fwidth; 632 ncol = width / fwidth;
746 nrow = height / fheight; 633 nrow = height / fheight;
747} 634}
748 635
749/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
750/* 637/*
… …
761 648
762 ws.ws_col = ncol; 649 ws.ws_col = ncol;
763 ws.ws_row = nrow; 650 ws.ws_row = nrow;
764 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
765 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
767 654
768#if 0 655#if 0
769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
770 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
771 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
772#endif 659#endif
773} 660}
774 661
… …
801#endif 688#endif
802 689
803 delete fontset[0]; 690 delete fontset[0];
804 fontset[0] = fs; 691 fontset[0] = fs;
805 692
806 prop = (*fs)[1]->properties (); 693 prop = fs->get (0, 1)->properties ();
807 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
696
808 fs->set_prop (prop); 697 fs->set_prop (prop, false);
809 698
810 fwidth = prop.width; 699 fwidth = prop.width;
811 fheight = prop.height; 700 fheight = prop.height;
812 fbase = prop.ascent; 701 fbase = prop.ascent;
813 702
… …
822 { 711 {
823 fontset[style] = fs = new rxvt_fontset (this); 712 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 713 rxvt_fontprop prop2 = prop;
825 714
826 if (res) 715 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 716 {
717 fs->populate (res);
718 fs->set_prop (prop2, false);
719 }
828 else 720 else
829 { 721 {
830 res = fontset[0]->fontdesc; 722 fs->populate (fontset[0]->fontdesc);
831 723
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 724 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; 725 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
726
727 fs->set_prop (prop2, true);
834 } 728 }
835 729
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 730 }
839#else 731#else
840 fontset[style] = fontset[0]; 732 fontset[style] = fontset[0];
841#endif 733#endif
842 } 734 }
… …
844 if (parent[0]) 736 if (parent[0])
845 { 737 {
846 resize_all_windows (0, 0, 0); 738 resize_all_windows (0, 0, 0);
847 scr_remap_chars (); 739 scr_remap_chars ();
848 scr_touch (true); 740 scr_touch (true);
849 } 741 }
850 742
851 return true; 743 return true;
852} 744}
853 745
746void
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 747rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 748{
856 XChangeProperty (dpy, parent[0], 749 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 750 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 751 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 752}
860 753
754void
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 755rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 756{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 757 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 758 char *s = rxvt_wcstoutf8 (ws);
865 759
866 XChangeProperty (dpy, parent[0], 760 XChangeProperty (dpy, parent[0],
… …
890#if ENABLE_EWMH 784#if ENABLE_EWMH
891 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892#endif 786#endif
893} 787}
894 788
789void
790rxvt_term::set_window_color (int idx, const char *color)
791{
895#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
896void
897rxvt_term::set_window_color (int idx, const char *color)
898{
899 rxvt_color xcol; 793 rxvt_color xcol;
900 int i; 794
901
902 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
903 return; 796 return;
904 797
905 color = strdup (color); 798 color = strdup (color);
906 allocated.push_back ((void *)color); 799 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
908 801
909 /* handle color aliases */ 802 /* handle color aliases */
910 if (isdigit (*color)) 803 if (isdigit (*color))
911 { 804 {
912 i = atoi (color); 805 int i = atoi (color);
913 806
914 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
808 {
915 { /* bright colors */ 809 /* bright colors */
916 i -= 8;
917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
918 goto done; 811 goto done;
919 } 812 }
920 813
921 if (i >= 0 && i <= 7) 814 if (i >= 0 && i <= 7)
815 {
922 { /* normal colors */ 816 /* normal colors */
923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 817 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
924 goto done; 818 goto done;
925 } 819 }
926 } 820 }
927 821
… …
932 * so just keep gobbling up the colormap 826 * so just keep gobbling up the colormap
933 */ 827 */
934 828
935 pix_colors_focused[idx] = xcol; 829 pix_colors_focused[idx] = xcol;
936 830
937 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */
939done: 831done:
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. */ 832 /*TODO: handle Color_BD, scrollbar background, etc. */
951 833
834 update_fade_color (idx);
952 recolour_cursor (); 835 recolour_cursor ();
953 scr_recolour (); 836 scr_recolour ();
837#endif /* XTERM_COLOR_CHANGE */
954} 838}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 839
960void 840void
961rxvt_term::recolour_cursor () 841rxvt_term::recolour_cursor ()
962{ 842{
963 XColor fg, bg; 843 XColor fg, bg;
… …
979 */ 859 */
980void 860void
981rxvt_term::set_colorfgbg () 861rxvt_term::set_colorfgbg ()
982{ 862{
983 unsigned int i; 863 unsigned int i;
984 const char *xpmb = "\0"; 864 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986 866
987 strcpy (fstr, "default"); 867 strcpy (fstr, "default");
988 strcpy (bstr, "default"); 868 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
… …
995 875
996 for (i = Color_Black; i <= Color_White; i++) 876 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 877 if (pix_colors[Color_bg] == pix_colors[i])
998 { 878 {
999 sprintf (bstr, "%d", (i - Color_Black)); 879 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 880#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 881 xpmb = "default;";
1002#endif 882#endif
1003 break; 883 break;
1004 } 884 }
1005 885
… …
1034 int old_width = szHint.width; 914 int old_width = szHint.width;
1035 int old_height = szHint.height; 915 int old_height = szHint.height;
1036 916
1037 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1038 918
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 919 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
920
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint)
923 {
924 szHint.flags &= ~(PBaseSize | PResizeInc);
1040 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1041 928
1042 if (!ignoreparent) 929 if (!ignoreparent)
1043 { 930 {
1044#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1045 /* 932 /*
… …
1085#else 972#else
1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 974#endif
1088 } 975 }
1089 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 981
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 983 {
1094 if (scrollBar.state) 984 if (scrollBar.state)
1095 { 985 scrollBar.resize ();
1096 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar ();
1100 }
1101 986
1102 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1104 width, height); 989 width, height);
1105 990
1106 scr_clear (); 991#ifdef HAVE_BG_PIXMAP
1107#ifdef XPM_BACKGROUND 992 if (bgPixmap.window_size_sensitive ())
1108 resize_pixmap (); 993 update_background ();
1109#endif 994#endif
1110 } 995 }
1111 996
1112 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1113 scr_reset (); 998 scr_reset ();
1114 999
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1000#ifdef HAVE_BG_PIXMAP
1116 //scr_touch (false); 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1117 1002// if (bgPixmap.pixmap)
1118#ifdef XPM_BACKGROUND
1119 if (pixmap)
1120 scr_touch (false); 1003// scr_touch (false);
1121#endif 1004#endif
1122 1005
1123#ifdef USE_XIM 1006#ifdef USE_XIM
1124 IMSetPosition (); 1007 IMSetPosition ();
1125#endif 1008#endif
… …
1192 1075
1193/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1194bool 1077bool
1195rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1196{ 1079{
1197 char *p;
1198 Atom atom; 1080 Atom atom;
1199 Window win; 1081 Window win;
1200 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1201 1083
1202 /* get current locale modifier */ 1084 /* get current locale modifier */
1203 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1204 { 1086 {
1205 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1207 1089
1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1209 *p = '\0'; 1091 *p = '\0';
1210 1092
1211 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1212 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1213 1095
… …
1280 1162
1281 term->make_current (); 1163 term->make_current ();
1282 1164
1283 if (text) 1165 if (text)
1284 { 1166 {
1285 void *str; 1167 wchar_t *str;
1286 1168
1287 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 { 1170 {
1289 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1292 1174
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1295 1177
1296 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1298 } 1180 }
1299 else 1181 else
1300 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1301 1183
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
1306 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,
… …
1621 || !focus 1503 || !focus
1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1623 || !IMisRunning ()) 1505 || !IMisRunning ())
1624 return; 1506 return;
1625 1507
1626 if (input_style & XIMPreeditArea) 1508 if (input_style & XIMPreeditPosition)
1627 { 1509 {
1628 im_set_size (preedit_rect); 1510 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 1512
1631 XSetICValues (Input_Context, 1513 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL); 1514 XNPreeditAttributes, preedit_attr, NULL);
1633 } 1515 }
1634 else 1516 else
1635 { 1517 {
… …
1652 XFree (status_attr); 1534 XFree (status_attr);
1653 } 1535 }
1654 1536
1655 XFree (preedit_attr); 1537 XFree (preedit_attr);
1656} 1538}
1657#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 */
1658 1607
1659/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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