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.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.320 by sf-exg, Sat Jan 30 20:43:56 2010 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT || ENABLE_PERL 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 ();
242 selection_clear (true);
223 243
224#ifdef USE_XIM 244#ifdef USE_XIM
225 im_destroy (); 245 im_destroy ();
226#endif 246#endif
227#ifdef XTERM_SCROLLBAR 247 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); 248 if (gc) XFreeGC (dpy, gc);
252 249
253 delete drawable; 250 delete drawable;
254 // destroy all windows 251 // destroy all windows
255 if (parent[0]) 252 if (parent[0])
… …
263 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
264#endif 261#endif
265 } 262 }
266 263
267 clear (); 264 clear ();
268 }
269 265
270 delete pix_colors_focused; 266 display->flush (); /* ideally .put should do this */
271#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused;
273#endif
274
275 displays.put (display); 267 displays.put (display);
268 }
276 269
277 scr_release (); 270 scr_release ();
278 271
279 /* clear all resources */ 272 /* clear all resources */
280 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
281 free (allocated [i]); 274 free (allocated [i]);
282 275
283 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
284 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
285 free (env_display); 279 free (env_display);
286 free (env_term); 280 free (env_term);
287 free (locale); 281 free (locale);
288 free (v_buffer); 282 free (v_buffer);
… …
292 delete argv; 286 delete argv;
293 287
294#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
295 delete keyboard; 289 delete keyboard;
296#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
297} 294}
298 295
299// child has exited, usually destroys 296// child has exited, usually destroys
300void 297void
301rxvt_term::child_cb (child_watcher &w, int status) 298rxvt_term::child_cb (ev::child &w, int status)
302{ 299{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 300 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 301
305 cmd_pid = 0; 302 cmd_pid = 0;
306 303
307 if (!OPTION (Opt_hold)) 304 if (!option (Opt_hold))
308 destroy (); 305 destroy ();
309} 306}
310 307
311void 308void
312rxvt_term::destroy () 309rxvt_term::destroy ()
313{ 310{
314 if (destroy_ev.active) 311 if (destroy_ev.is_active ())
315 return; 312 return;
316 313
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318 315
319#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
… …
323 if (display) 320 if (display)
324 { 321 {
325#if USE_XIM 322#if USE_XIM
326 im_ev.stop (display); 323 im_ev.stop (display);
327#endif 324#endif
328#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
330#endif
331#if TRANSPARENT || ENABLE_PERL 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
333#endif 328#endif
334 incr_ev.stop (); 329 incr_ev.stop ();
335 termwin_ev.stop (display); 330 termwin_ev.stop (display);
336 vt_ev.stop (display); 331 vt_ev.stop (display);
337 } 332 }
338 333
339 check_ev.stop (); 334 flush_ev.stop ();
340 pty_ev.stop (); 335 pty_ev.stop ();
341#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
343#endif 338#endif
344#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
352#endif 347#endif
353#ifdef POINTER_BLANK 348#ifdef POINTER_BLANK
354 pointer_ev.stop (); 349 pointer_ev.stop ();
355#endif 350#endif
356 351
357 destroy_ev.start (0); 352 destroy_ev.start ();
358} 353}
359 354
360void 355void
361rxvt_term::destroy_cb (time_watcher &w) 356rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 357{
363 make_current (); 358 make_current ();
364 359
365 delete this; 360 delete this;
366} 361}
… …
420 else 415 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 417 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 419 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 421 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 423}
429#endif 424#endif
430 425
… …
454 DisplayString (display)); 449 DisplayString (display));
455 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
456 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
457} 452}
458 453
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#if ENABLE_PERL
510 rootwin_ev.start (display, display->root);
511#endif
512
513 set_colorfgbg ();
514
515 init_command (cmd_argv);
516
517 free (cmd_argv);
518
519 if (pty->pty >= 0)
520 pty_ev.start (pty->pty, EVENT_READ);
521
522 check_ev.start ();
523
524 HOOK_INVOKE ((this, HOOK_START, DT_END));
525
526#if ENABLE_XEMBED
527 if (rs[Rs_embed])
528 {
529 long info[2] = { 0, XEMBED_MAPPED };
530
531 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
532 32, PropModeReplace, (unsigned char *)&info, 2);
533 }
534#endif
535
536 XMapWindow (dpy, vt);
537 XMapWindow (dpy, parent[0]);
538
539 return true;
540}
541
542static struct sig_handlers 454static struct sig_handlers
543{ 455{
544 sig_watcher sw_term, sw_int; 456 ev::sig sw_term, sw_int;
545 457
546 /* 458 /*
547 * Catch a fatal signal and tidy up before quitting 459 * Catch a fatal signal and tidy up before quitting
548 */ 460 */
549 void 461 void sig_term (ev::sig &w, int revents);
550 sig_term (sig_watcher &w) 462
463 sig_handlers ()
551 { 464 {
552 rxvt_emergency_cleanup (); 465 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
553 signal (w.signum, SIG_DFL);
554 kill (getpid (), w.signum);
555 }
556
557 sig_handlers ()
558 : sw_term (this, &sig_handlers::sig_term),
559 sw_int (this, &sig_handlers::sig_term) 466 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
560 {
561 } 467 }
562} sig_handlers; 468} sig_handlers;
563 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
564char **rxvt_environ; // startup environment 478char **rxvt_environ; // startup environment
565 479
566void 480void
567rxvt_init () 481rxvt_init ()
568{ 482{
569 ptytty::init (); 483 ptytty::init ();
484
485 if (!ev_default_loop (0))
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
570 487
571 rxvt_environ = environ; 488 rxvt_environ = environ;
572 489
573 signal (SIGHUP, SIG_IGN); 490 signal (SIGHUP, SIG_IGN);
574 signal (SIGPIPE, SIG_IGN); 491 signal (SIGPIPE, SIG_IGN);
575 492
576 sig_handlers.sw_term.start (SIGTERM); 493 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
577 sig_handlers.sw_int.start (SIGINT); 494 sig_handlers.sw_int.start (SIGINT); ev_unref ();
578 495
579 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
580 /* signal (SIGURG, SIG_DFL); */ 497 /* signal (SIGURG, SIG_DFL); */
581 498
582 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
584 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
585 502
586 XrmInitialize (); 503 XrmInitialize ();
587} 504}
588 505
589/* ------------------------------------------------------------------------- *
590 * MEMORY ALLOCATION WRAPPERS *
591 * ------------------------------------------------------------------------- */
592void *
593rxvt_malloc (size_t size)
594{
595 void *p = malloc (size);
596
597 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n");
599
600 return p;
601}
602
603void *
604rxvt_calloc (size_t number, size_t size)
605{
606 void *p = calloc (number, size);
607
608 if (!p)
609 rxvt_fatal ("memory allocation failure. aborting.\n");
610
611 return p;
612}
613
614void *
615rxvt_realloc (void *ptr, size_t size)
616{
617 void *p = realloc (ptr, size);
618
619 if (!p)
620 rxvt_fatal ("memory allocation failure. aborting.\n");
621
622 return p;
623}
624
625/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
626/* 507/*
627 * window size/position calculcations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
628 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
629 */ 510 */
630void 511void
631rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
632{ 513{
633 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
634 int x, y, sb_w, flags; 515 int x, y, flags;
635 unsigned int w, h; 516 unsigned int w, h;
636 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
637 518
638 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
639 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
649 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
650 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
651 532
652 if (flags & WidthValue) 533 if (flags & WidthValue)
653 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
654 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
655 szHint.flags |= USSize; 539 szHint.flags |= USSize;
656 } 540 }
657 541
658 if (flags & HeightValue) 542 if (flags & HeightValue)
659 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
660 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
661 szHint.flags |= USSize; 548 szHint.flags |= USSize;
662 } 549 }
663 550
664 if (flags & XValue) 551 if (flags & XValue)
665 { 552 {
… …
696 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
697 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
698 585
699 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
700 587
701 sb_w = 0;
702 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
703 589
704 if (scrollBar.state) 590 if (scrollBar.state)
705 { 591 {
706 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
707 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
708 594
709 if (!OPTION (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
710 window_vt_x += sb_w; 596 window_vt_x += sb_w;
711 } 597 }
712 598
713 szHint.width_inc = fwidth; 599 szHint.width_inc = fwidth;
714 szHint.height_inc = fheight; 600 szHint.height_inc = fheight;
… …
735 { 621 {
736 min_it (height, max_height); 622 min_it (height, max_height);
737 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
738 } 624 }
739 625
740 if (scrollBar.state && OPTION (Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w;
742
743 if (recalc_x) 626 if (recalc_x)
744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745 628
746 if (recalc_y) 629 if (recalc_y)
747 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
748 631
749 ncol = width / fwidth; 632 ncol = width / fwidth;
750 nrow = height / fheight; 633 nrow = height / fheight;
751} 634}
752 635
753/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
754/* 637/*
… …
765 648
766 ws.ws_col = ncol; 649 ws.ws_col = ncol;
767 ws.ws_row = nrow; 650 ws.ws_row = nrow;
768 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
769 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
770 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
771 654
772#if 0 655#if 0
773 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
774 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
775 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
776#endif 659#endif
777} 660}
778 661
… …
807 delete fontset[0]; 690 delete fontset[0];
808 fontset[0] = fs; 691 fontset[0] = fs;
809 692
810 prop = (*fs)[1]->properties (); 693 prop = (*fs)[1]->properties ();
811 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
696
812 fs->set_prop (prop); 697 fs->set_prop (prop, false);
813 698
814 fwidth = prop.width; 699 fwidth = prop.width;
815 fheight = prop.height; 700 fheight = prop.height;
816 fbase = prop.ascent; 701 fbase = prop.ascent;
817 702
… …
826 { 711 {
827 fontset[style] = fs = new rxvt_fontset (this); 712 fontset[style] = fs = new rxvt_fontset (this);
828 rxvt_fontprop prop2 = prop; 713 rxvt_fontprop prop2 = prop;
829 714
830 if (res) 715 if (res)
831 prop2.weight = prop2.slant = rxvt_fontprop::unset; 716 {
717 fs->populate (res);
718 fs->set_prop (prop2, false);
719 }
832 else 720 else
833 { 721 {
834 res = fontset[0]->fontdesc; 722 fs->populate (fontset[0]->fontdesc);
835 723
836 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;
837 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);
838 } 728 }
839 729
840 fs->populate (res);
841 fs->set_prop (prop2);
842 } 730 }
843#else 731#else
844 fontset[style] = fontset[0]; 732 fontset[style] = fontset[0];
845#endif 733#endif
846 } 734 }
… …
848 if (parent[0]) 736 if (parent[0])
849 { 737 {
850 resize_all_windows (0, 0, 0); 738 resize_all_windows (0, 0, 0);
851 scr_remap_chars (); 739 scr_remap_chars ();
852 scr_touch (true); 740 scr_touch (true);
853 } 741 }
854 742
855 return true; 743 return true;
856} 744}
857 745
746void
858void rxvt_term::set_string_property (Atom prop, const char *str, int len) 747rxvt_term::set_string_property (Atom prop, const char *str, int len)
859{ 748{
860 XChangeProperty (dpy, parent[0], 749 XChangeProperty (dpy, parent[0],
861 prop, XA_STRING, 8, PropModeReplace, 750 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 751 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 752}
864 753
754void
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 755rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 756{
867 wchar_t *ws = rxvt_mbstowcs (str, len); 757 wchar_t *ws = rxvt_mbstowcs (str, len);
868 char *s = rxvt_wcstoutf8 (ws); 758 char *s = rxvt_wcstoutf8 (ws);
869 759
870 XChangeProperty (dpy, parent[0], 760 XChangeProperty (dpy, parent[0],
… …
894#if ENABLE_EWMH 784#if ENABLE_EWMH
895 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
896#endif 786#endif
897} 787}
898 788
789void
790rxvt_term::set_window_color (int idx, const char *color)
791{
899#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
900void
901rxvt_term::set_window_color (int idx, const char *color)
902{
903 rxvt_color xcol; 793 rxvt_color xcol;
904 int i; 794
905
906 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
907 return; 796 return;
908 797
909 color = strdup (color); 798 color = strdup (color);
910 allocated.push_back ((void *)color); 799 allocated.push_back ((void *)color);
911 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
912 801
913 /* handle color aliases */ 802 /* handle color aliases */
914 if (isdigit (*color)) 803 if (isdigit (*color))
915 { 804 {
916 i = atoi (color); 805 int i = atoi (color);
917 806
918 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
808 {
919 { /* bright colors */ 809 /* bright colors */
920 i -= 8;
921 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
922 goto done; 811 goto done;
923 } 812 }
924 813
925 if (i >= 0 && i <= 7) 814 if (i >= 0 && i <= 7)
815 {
926 { /* normal colors */ 816 /* normal colors */
927 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 817 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
928 goto done; 818 goto done;
929 } 819 }
930 } 820 }
931 821
… …
936 * so just keep gobbling up the colormap 826 * so just keep gobbling up the colormap
937 */ 827 */
938 828
939 pix_colors_focused[idx] = xcol; 829 pix_colors_focused[idx] = xcol;
940 830
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 831done:
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 832 /*TODO: handle Color_BD, scrollbar background, etc. */
945 833
946 update_fade_color (idx); 834 update_fade_color (idx);
947 recolour_cursor (); 835 recolour_cursor ();
948 scr_recolour (); 836 scr_recolour ();
837#endif /* XTERM_COLOR_CHANGE */
949} 838}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */
954 839
955void 840void
956rxvt_term::recolour_cursor () 841rxvt_term::recolour_cursor ()
957{ 842{
958 XColor fg, bg; 843 XColor fg, bg;
… …
974 */ 859 */
975void 860void
976rxvt_term::set_colorfgbg () 861rxvt_term::set_colorfgbg ()
977{ 862{
978 unsigned int i; 863 unsigned int i;
979 const char *xpmb = "\0"; 864 const char *xpmb = "";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 866
982 strcpy (fstr, "default"); 867 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 868 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
… …
990 875
991 for (i = Color_Black; i <= Color_White; i++) 876 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 877 if (pix_colors[Color_bg] == pix_colors[i])
993 { 878 {
994 sprintf (bstr, "%d", (i - Color_Black)); 879 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 880#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 881 xpmb = "default;";
997#endif 882#endif
998 break; 883 break;
999 } 884 }
1000 885
… …
1029 int old_width = szHint.width; 914 int old_width = szHint.width;
1030 int old_height = szHint.height; 915 int old_height = szHint.height;
1031 916
1032 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1033 918
1034 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);
1035 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1036 928
1037 if (!ignoreparent) 929 if (!ignoreparent)
1038 { 930 {
1039#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1040 /* 932 /*
… …
1080#else 972#else
1081 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1082#endif 974#endif
1083 } 975 }
1084 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1085 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1086 981
1087 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1088 { 983 {
1089 if (scrollBar.state) 984 if (scrollBar.state)
1090 { 985 scrollBar.resize ();
1091 XMoveResizeWindow (dpy, scrollBar.win,
1092 window_sb_x, 0,
1093 scrollbar_TotalWidth (), szHint.height);
1094 resize_scrollbar ();
1095 }
1096 986
1097 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1098 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1099 width, height); 989 width, height);
1100 990
1101 scr_clear (); 991#ifdef HAVE_BG_PIXMAP
1102#ifdef XPM_BACKGROUND 992 if (bgPixmap.window_size_sensitive ())
1103 resize_pixmap (); 993 update_background ();
1104#endif 994#endif
1105 } 995 }
1106 996
1107 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1108 scr_reset (); 998 scr_reset ();
1109 999
1110 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1111 //scr_touch (false); 1001 //scr_touch (false);
1112 1002
1113#ifdef XPM_BACKGROUND 1003#ifdef HAVE_BG_PIXMAP
1114 if (pixmap) 1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1115 scr_touch (false); 1006// scr_touch (false);
1116#endif 1007#endif
1117 1008
1118#ifdef USE_XIM 1009#ifdef USE_XIM
1119 IMSetPosition (); 1010 IMSetPosition ();
1120#endif 1011#endif
… …
1187 1078
1188/* Checking whether input method is running. */ 1079/* Checking whether input method is running. */
1189bool 1080bool
1190rxvt_term::IMisRunning () 1081rxvt_term::IMisRunning ()
1191{ 1082{
1192 char *p;
1193 Atom atom; 1083 Atom atom;
1194 Window win; 1084 Window win;
1195 char server[IMBUFSIZ]; 1085 char server[IMBUFSIZ];
1196 1086
1197 /* get current locale modifier */ 1087 /* get current locale modifier */
1198 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1088 if (char *p = XSetLocaleModifiers (0))
1199 { 1089 {
1200 strcpy (server, "@server="); 1090 strcpy (server, "@server=");
1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1091 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1202 1092
1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1093 if (p = strchr (server + 1, '@')) /* first one only */
1204 *p = '\0'; 1094 *p = '\0';
1205 1095
1206 atom = XInternAtom (dpy, server, False); 1096 atom = XInternAtom (dpy, server, False);
1207 win = XGetSelectionOwner (dpy, atom); 1097 win = XGetSelectionOwner (dpy, atom);
1208 1098
… …
1275 1165
1276 term->make_current (); 1166 term->make_current ();
1277 1167
1278 if (text) 1168 if (text)
1279 { 1169 {
1280 void *str; 1170 wchar_t *str;
1281 1171
1282 if (!text->encoding_is_wchar && text->string.multi_byte) 1172 if (!text->encoding_is_wchar && text->string.multi_byte)
1283 { 1173 {
1284 // of course, X makes it ugly again 1174 // of course, X makes it ugly again
1285 if (term->rs[Rs_imLocale]) 1175 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->rs[Rs_imLocale]); 1176 SET_LOCALE (term->rs[Rs_imLocale]);
1287 1177
1288 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1178 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1289 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1179 mbstowcs (str, text->string.multi_byte, text->length + 1);
1290 1180
1291 if (term->rs[Rs_imLocale]) 1181 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->locale); 1182 SET_LOCALE (term->locale);
1293 } 1183 }
1294 else 1184 else
1295 str = (void *)text->string.wide_char; 1185 str = text->string.wide_char;
1296 1186
1297 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1187 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1298 DT_INT, call_data->caret, 1188 DT_INT, call_data->caret,
1299 DT_INT, call_data->chg_first, 1189 DT_INT, call_data->chg_first,
1300 DT_INT, call_data->chg_length, 1190 DT_INT, call_data->chg_length,
1301 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1191 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1620 1510
1621 if (input_style & XIMPreeditPosition) 1511 if (input_style & XIMPreeditPosition)
1622 { 1512 {
1623 im_set_size (preedit_rect); 1513 im_set_size (preedit_rect);
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625 1515
1626 XSetICValues (Input_Context, 1516 XSetICValues (Input_Context,
1627 XNPreeditAttributes, preedit_attr, NULL); 1517 XNPreeditAttributes, preedit_attr, NULL);
1628 } 1518 }
1629 else 1519 else
1630 { 1520 {
… …
1647 XFree (status_attr); 1537 XFree (status_attr);
1648 } 1538 }
1649 1539
1650 XFree (preedit_attr); 1540 XFree (preedit_attr);
1651} 1541}
1652#endif /* USE_XIM */ 1542#endif /* USE_XIM */
1543
1544void
1545rxvt_term::get_window_origin (int &x, int &y)
1546{
1547 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550}
1551
1552Pixmap
1553rxvt_term::get_pixmap_property (int prop_id)
1554{
1555 if (prop_id > 0 && prop_id < NUM_XA)
1556 if (xa[prop_id])
1557 {
1558 int aformat;
1559 unsigned long nitems, bytes_after;
1560 Atom atype;
1561 unsigned char *prop = NULL;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP)
1566 return *(Pixmap *)prop;
1567 }
1568
1569 return None;
1570}
1571
1572#ifdef HAVE_BG_PIXMAP
1573# if TRACE_PIXMAPS
1574# undef update_background
1575void
1576rxvt_term::trace_update_background (const char *file, int line)
1577{
1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579 update_background ();
1580}
1581# endif
1582
1583void
1584rxvt_term::update_background ()
1585{
1586 if (update_background_ev.is_active ())
1587 return;
1588
1589 bgPixmap.invalidate ();
1590
1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1592
1593 if (to_wait <= 0.)
1594 bgPixmap.render ();
1595 else
1596 update_background_ev.start (to_wait);
1597}
1598
1599void
1600rxvt_term::update_background_cb (ev::timer &w, int revents)
1601{
1602 make_current ();
1603
1604 update_background_ev.stop ();
1605 bgPixmap.render ();
1606 refresh_check ();
1607}
1608
1609#endif /* HAVE_BG_PIXMAP */
1653 1610
1654/*----------------------- end-of-file (C source) -----------------------*/ 1611/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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