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.252 by ayin, Mon Oct 8 07:05:23 2007 UTC vs.
Revision 1.322 by root, Tue Mar 30 23:00:35 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"
… …
88class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
89 92
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 94{
92 compose_char *cc; 95 compose_char *cc;
93 96
94 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 99 cc = (*this)[c1];
97 while (cc) 100 while (cc)
98 { 101 {
… …
147 150
148} 151}
149#endif 152#endif
150 153
151rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
152 : 155{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 176#endif
156#if HAVE_BG_PIXMAP 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 update_background_ev(this, &rxvt_term::update_background_cb), 178#ifdef USE_XIM
158#endif 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 180#endif
177#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 183#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 184#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 186#endif
186 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 194
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
201#endif 201#endif
202} 202}
203 203
204// 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.
205// for use before an emergency exit 205// for use before an emergency exit
206void
206void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
207{ 208{
208 if (cmd_pid) 209 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
210 211
211 pty_ev.stop (); 212 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
224 delete fontset[i]; 225 delete fontset[i];
225#endif 226#endif
226 delete fontset[0]; 227 delete fontset[0];
227 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
228 if (display) 239 if (display)
229 { 240 {
230 selection_clear (); 241 selection_clear ();
242 selection_clear (true);
231 243
232#ifdef USE_XIM 244#ifdef USE_XIM
233 im_destroy (); 245 im_destroy ();
234#endif 246#endif
235#ifdef XTERM_SCROLLBAR 247 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 248 if (gc) XFreeGC (dpy, gc);
260 249
261 delete drawable; 250 delete drawable;
262 // destroy all windows 251 // destroy all windows
263 if (parent[0]) 252 if (parent[0])
… …
271 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
272#endif 261#endif
273 } 262 }
274 263
275 clear (); 264 clear ();
276 }
277 265
278 delete [] pix_colors_focused; 266 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 267 displays.put (display);
268 }
284 269
285 scr_release (); 270 scr_release ();
286 271
287 /* clear all resources */ 272 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 274 free (allocated [i]);
290 275
291 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
292 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
293 free (env_display); 279 free (env_display);
294 free (env_term); 280 free (env_term);
295 free (locale); 281 free (locale);
296 free (v_buffer); 282 free (v_buffer);
… …
300 delete argv; 286 delete argv;
301 287
302#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
303 delete keyboard; 289 delete keyboard;
304#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
305} 294}
306 295
307// child has exited, usually destroys 296// child has exited, usually destroys
308void 297void
309rxvt_term::child_cb (child_watcher &w, int status) 298rxvt_term::child_cb (ev::child &w, int status)
310{ 299{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 300 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 301
313 cmd_pid = 0; 302 cmd_pid = 0;
314 303
… …
317} 306}
318 307
319void 308void
320rxvt_term::destroy () 309rxvt_term::destroy ()
321{ 310{
322 if (destroy_ev.active) 311 if (destroy_ev.is_active ())
323 return; 312 return;
324 313
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 315
327#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
… …
331 if (display) 320 if (display)
332 { 321 {
333#if USE_XIM 322#if USE_XIM
334 im_ev.stop (display); 323 im_ev.stop (display);
335#endif 324#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
341#endif 328#endif
342 incr_ev.stop (); 329 incr_ev.stop ();
343 termwin_ev.stop (display); 330 termwin_ev.stop (display);
344 vt_ev.stop (display); 331 vt_ev.stop (display);
345 } 332 }
346 333
347 check_ev.stop (); 334 flush_ev.stop ();
348 pty_ev.stop (); 335 pty_ev.stop ();
349#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
351#endif 338#endif
352#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
360#endif 347#endif
361#ifdef POINTER_BLANK 348#ifdef POINTER_BLANK
362 pointer_ev.stop (); 349 pointer_ev.stop ();
363#endif 350#endif
364 351
365 destroy_ev.start (0); 352 destroy_ev.start ();
366} 353}
367 354
368void 355void
369rxvt_term::destroy_cb (time_watcher &w) 356rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 357{
371 make_current (); 358 make_current ();
372 359
373 delete this; 360 delete this;
374} 361}
… …
428 else 415 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 417 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 419 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 421 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 423}
437#endif 424#endif
438 425
… …
462 DisplayString (display)); 449 DisplayString (display));
463 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
465} 452}
466 453
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
555#endif
556
557 set_colorfgbg ();
558
559 init_command (cmd_argv);
560
561 free (cmd_argv);
562
563 if (pty->pty >= 0)
564 pty_ev.start (pty->pty, EVENT_READ);
565
566 check_ev.start ();
567
568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
583 return true;
584}
585
586static struct sig_handlers 454static struct sig_handlers
587{ 455{
588 sig_watcher sw_term, sw_int; 456 ev::sig sw_term, sw_int;
589 457
590 /* 458 /*
591 * Catch a fatal signal and tidy up before quitting 459 * Catch a fatal signal and tidy up before quitting
592 */ 460 */
593 void 461 void sig_term (ev::sig &w, int revents);
594 sig_term (sig_watcher &w) 462
463 sig_handlers ()
595 { 464 {
596 rxvt_emergency_cleanup (); 465 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597 signal (w.signum, SIG_DFL);
598 kill (getpid (), w.signum);
599 }
600
601 sig_handlers ()
602 : sw_term (this, &sig_handlers::sig_term),
603 sw_int (this, &sig_handlers::sig_term) 466 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604 {
605 } 467 }
606} sig_handlers; 468} sig_handlers;
607 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
608char **rxvt_environ; // startup environment 478char **rxvt_environ; // startup environment
609 479
610void 480void
611rxvt_init () 481rxvt_init ()
612{ 482{
613 ptytty::init (); 483 ptytty::init ();
484
485 if (!ev_default_loop (0))
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
614 487
615 rxvt_environ = environ; 488 rxvt_environ = environ;
616 489
617 signal (SIGHUP, SIG_IGN); 490 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 491 signal (SIGPIPE, SIG_IGN);
619 492
620 sig_handlers.sw_term.start (SIGTERM); 493 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621 sig_handlers.sw_int.start (SIGINT); 494 sig_handlers.sw_int.start (SIGINT); ev_unref ();
622 495
623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
624 /* signal (SIGURG, SIG_DFL); */ 497 /* signal (SIGURG, SIG_DFL); */
625 498
626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627 // TODO: handle this with exceptions and tolerate the memory loss 500 // TODO: handle this with exceptions and tolerate the memory loss
628 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
629 502
630 XrmInitialize (); 503 XrmInitialize ();
631}
632
633/* ------------------------------------------------------------------------- *
634 * MEMORY ALLOCATION WRAPPERS *
635 * ------------------------------------------------------------------------- */
636void *
637rxvt_malloc (size_t size)
638{
639 void *p = malloc (size);
640
641 if (!p)
642 rxvt_fatal ("memory allocation failure. aborting.\n");
643
644 return p;
645}
646
647void *
648rxvt_calloc (size_t number, size_t size)
649{
650 void *p = calloc (number, size);
651
652 if (!p)
653 rxvt_fatal ("memory allocation failure. aborting.\n");
654
655 return p;
656}
657
658void *
659rxvt_realloc (void *ptr, size_t size)
660{
661 void *p = realloc (ptr, size);
662
663 if (!p)
664 rxvt_fatal ("memory allocation failure. aborting.\n");
665
666 return p;
667} 504}
668 505
669/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
670/* 507/*
671 * window size/position calculations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
… …
673 */ 510 */
674void 511void
675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
676{ 513{
677 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
678 int x, y, sb_w, flags; 515 int x, y, flags;
679 unsigned int w, h; 516 unsigned int w, h;
680 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
681 518
682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
683 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
693 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
694 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
695 532
696 if (flags & WidthValue) 533 if (flags & WidthValue)
697 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
698 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
699 szHint.flags |= USSize; 539 szHint.flags |= USSize;
700 } 540 }
701 541
702 if (flags & HeightValue) 542 if (flags & HeightValue)
703 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
704 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
705 szHint.flags |= USSize; 548 szHint.flags |= USSize;
706 } 549 }
707 550
708 if (flags & XValue) 551 if (flags & XValue)
709 { 552 {
… …
740 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
741 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
742 585
743 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
744 587
745 sb_w = 0;
746 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
747 589
748 if (scrollBar.state) 590 if (scrollBar.state)
749 { 591 {
750 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
751 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
752 594
753 if (!option (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
754 window_vt_x += sb_w; 596 window_vt_x += sb_w;
755 } 597 }
… …
779 { 621 {
780 min_it (height, max_height); 622 min_it (height, max_height);
781 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
782 } 624 }
783 625
784 if (scrollBar.state && option (Opt_scrollBar_right))
785 window_sb_x = szHint.width - sb_w;
786
787 if (recalc_x) 626 if (recalc_x)
788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789 628
790 if (recalc_y) 629 if (recalc_y)
791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
792 631
793 ncol = width / fwidth; 632 ncol = width / fwidth;
794 nrow = height / fheight; 633 nrow = height / fheight;
795} 634}
796 635
797/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
798/* 637/*
… …
809 648
810 ws.ws_col = ncol; 649 ws.ws_col = ncol;
811 ws.ws_row = nrow; 650 ws.ws_row = nrow;
812 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
813 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
815 654
816#if 0 655#if 0
817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
818 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
819 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
820#endif 659#endif
821} 660}
822 661
… …
849#endif 688#endif
850 689
851 delete fontset[0]; 690 delete fontset[0];
852 fontset[0] = fs; 691 fontset[0] = fs;
853 692
854 prop = (*fs)[1]->properties (); 693 prop = fs->get (0, 1)->properties ();
855 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
856 696
857 fs->set_prop (prop, false); 697 fs->set_prop (prop, false);
858 698
859 fwidth = prop.width; 699 fwidth = prop.width;
860 fheight = prop.height; 700 fheight = prop.height;
… …
896 if (parent[0]) 736 if (parent[0])
897 { 737 {
898 resize_all_windows (0, 0, 0); 738 resize_all_windows (0, 0, 0);
899 scr_remap_chars (); 739 scr_remap_chars ();
900 scr_touch (true); 740 scr_touch (true);
901 } 741 }
902 742
903 return true; 743 return true;
904} 744}
905 745
746void
906void rxvt_term::set_string_property (Atom prop, const char *str, int len) 747rxvt_term::set_string_property (Atom prop, const char *str, int len)
907{ 748{
908 XChangeProperty (dpy, parent[0], 749 XChangeProperty (dpy, parent[0],
909 prop, XA_STRING, 8, PropModeReplace, 750 prop, XA_STRING, 8, PropModeReplace,
910 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 751 (const unsigned char *)str, len >= 0 ? len : strlen (str));
911} 752}
912 753
754void
913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 755rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914{ 756{
915 wchar_t *ws = rxvt_mbstowcs (str, len); 757 wchar_t *ws = rxvt_mbstowcs (str, len);
916 char *s = rxvt_wcstoutf8 (ws); 758 char *s = rxvt_wcstoutf8 (ws);
917 759
918 XChangeProperty (dpy, parent[0], 760 XChangeProperty (dpy, parent[0],
… …
947void 789void
948rxvt_term::set_window_color (int idx, const char *color) 790rxvt_term::set_window_color (int idx, const char *color)
949{ 791{
950#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
951 rxvt_color xcol; 793 rxvt_color xcol;
952 int i; 794
953
954 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
955 return; 796 return;
956 797
957 color = strdup (color); 798 color = strdup (color);
958 allocated.push_back ((void *)color); 799 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
960 801
961 /* handle color aliases */ 802 /* handle color aliases */
962 if (isdigit (*color)) 803 if (isdigit (*color))
963 { 804 {
964 i = atoi (color); 805 int i = atoi (color);
965 806
966 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
808 {
967 { /* bright colors */ 809 /* bright colors */
968 i -= 8;
969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
970 goto done; 811 goto done;
971 } 812 }
972 813
973 if (i >= 0 && i <= 7) 814 if (i >= 0 && i <= 7)
815 {
974 { /* normal colors */ 816 /* normal colors */
975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 817 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976 goto done; 818 goto done;
977 } 819 }
978 } 820 }
979 821
… …
984 * so just keep gobbling up the colormap 826 * so just keep gobbling up the colormap
985 */ 827 */
986 828
987 pix_colors_focused[idx] = xcol; 829 pix_colors_focused[idx] = xcol;
988 830
989 /* XSetWindowAttributes attr; */
990 /* Cursor cursor; */
991done: 831done:
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 832 /*TODO: handle Color_BD, scrollbar background, etc. */
993 833
994 update_fade_color (idx); 834 update_fade_color (idx);
995 recolour_cursor (); 835 recolour_cursor ();
996 scr_recolour (); 836 scr_recolour ();
997#endif /* XTERM_COLOR_CHANGE */ 837#endif /* XTERM_COLOR_CHANGE */
998} 838}
999 839
1000void 840void
1001rxvt_term::recolour_cursor () 841rxvt_term::recolour_cursor ()
1002{ 842{
… …
1019 */ 859 */
1020void 860void
1021rxvt_term::set_colorfgbg () 861rxvt_term::set_colorfgbg ()
1022{ 862{
1023 unsigned int i; 863 unsigned int i;
1024 const char *xpmb = "\0"; 864 const char *xpmb = "";
1025 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1026 866
1027 strcpy (fstr, "default"); 867 strcpy (fstr, "default");
1028 strcpy (bstr, "default"); 868 strcpy (bstr, "default");
1029 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
… …
1074 int old_width = szHint.width; 914 int old_width = szHint.width;
1075 int old_height = szHint.height; 915 int old_height = szHint.height;
1076 916
1077 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1078 918
1079 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);
1080 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1081 928
1082 if (!ignoreparent) 929 if (!ignoreparent)
1083 { 930 {
1084#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1085 /* 932 /*
… …
1125#else 972#else
1126 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1127#endif 974#endif
1128 } 975 }
1129 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1131 981
1132 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1133 { 983 {
1134 if (scrollBar.state) 984 if (scrollBar.state)
1135 { 985 scrollBar.resize ();
1136 XMoveResizeWindow (dpy, scrollBar.win,
1137 window_sb_x, 0,
1138 scrollbar_TotalWidth (), szHint.height);
1139 resize_scrollbar ();
1140 }
1141 986
1142 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1143 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1144 width, height); 989 width, height);
1145 990
1146#ifdef HAVE_BG_PIXMAP 991#ifdef HAVE_BG_PIXMAP
1147 if (bgPixmap.window_size_sensitive ()) 992 if (bgPixmap.window_size_sensitive ())
1148 update_background (); 993 update_background ();
1149#endif 994#endif
1150
1151 scr_clear ();
1152 } 995 }
1153 996
1154 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1155 scr_reset (); 998 scr_reset ();
1156
1157 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 //scr_touch (false);
1159 999
1160#ifdef HAVE_BG_PIXMAP 1000#ifdef HAVE_BG_PIXMAP
1161// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1162// if (bgPixmap.pixmap) 1002// if (bgPixmap.pixmap)
1163// scr_touch (false); 1003// scr_touch (false);
… …
1235 1075
1236/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1237bool 1077bool
1238rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1239{ 1079{
1240 char *p;
1241 Atom atom; 1080 Atom atom;
1242 Window win; 1081 Window win;
1243 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1244 1083
1245 /* get current locale modifier */ 1084 /* get current locale modifier */
1246 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1247 { 1086 {
1248 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1249 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1250 1089
1251 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1252 *p = '\0'; 1091 *p = '\0';
1253 1092
1254 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1255 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1256 1095
… …
1323 1162
1324 term->make_current (); 1163 term->make_current ();
1325 1164
1326 if (text) 1165 if (text)
1327 { 1166 {
1328 void *str; 1167 wchar_t *str;
1329 1168
1330 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1331 { 1170 {
1332 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1333 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1334 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1335 1174
1336 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1337 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1338 1177
1339 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1340 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1341 } 1180 }
1342 else 1181 else
1343 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1344 1183
1345 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1346 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1347 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1348 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
1349 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,
… …
1668 1507
1669 if (input_style & XIMPreeditPosition) 1508 if (input_style & XIMPreeditPosition)
1670 { 1509 {
1671 im_set_size (preedit_rect); 1510 im_set_size (preedit_rect);
1672 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1673 1512
1674 XSetICValues (Input_Context, 1513 XSetICValues (Input_Context,
1675 XNPreeditAttributes, preedit_attr, NULL); 1514 XNPreeditAttributes, preedit_attr, NULL);
1676 } 1515 }
1677 else 1516 else
1678 { 1517 {
… …
1695 XFree (status_attr); 1534 XFree (status_attr);
1696 } 1535 }
1697 1536
1698 XFree (preedit_attr); 1537 XFree (preedit_attr);
1699} 1538}
1700#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1701 1540
1702void 1541void
1703rxvt_term::get_window_origin (int &x, int &y) 1542rxvt_term::get_window_origin (int &x, int &y)
1704{ 1543{
1705 Window cr; 1544 Window cr;
1706 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1707/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1708} 1547}
1709 1548
1710Pixmap 1549Pixmap
1711rxvt_term::get_pixmap_property (int prop_id) 1550rxvt_term::get_pixmap_property (int prop_id)
1712{ 1551{
… …
1719 unsigned char *prop = NULL; 1558 unsigned char *prop = NULL;
1720 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1721 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1722 &nitems, &bytes_after, &prop); 1561 &nitems, &bytes_after, &prop);
1723 if (result == Success && prop && atype == XA_PIXMAP) 1562 if (result == Success && prop && atype == XA_PIXMAP)
1724 {
1725 return *(Pixmap *)prop; 1563 return *(Pixmap *)prop;
1726 }
1727 } 1564 }
1565
1728 return None; 1566 return None;
1729} 1567}
1730 1568
1731#ifdef HAVE_BG_PIXMAP 1569#ifdef HAVE_BG_PIXMAP
1732int 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
1733rxvt_term::update_background () 1581rxvt_term::update_background ()
1734{ 1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1735 bgPixmap.invalidate (); 1586 bgPixmap.invalidate ();
1736 1587
1737 /* no chance of real time refresh if we are blurring ! */ 1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1738 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1589
1590 if (to_wait <= 0.)
1739 bgPixmap.render (); 1591 bgPixmap.render ();
1740 else 1592 else
1741 { 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
1742 update_background_ev.stop (); 1601 update_background_ev.stop ();
1743 if (!bgPixmap.need_client_side_rendering())
1744 update_background_ev.start (NOW + .05);
1745 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1746 update_background_ev.start (NOW + .2); /* very slow !!! */
1747 else
1748 update_background_ev.start (NOW + .07);
1749 }
1750 return 0;
1751}
1752
1753void
1754rxvt_term::update_background_cb (time_watcher &w)
1755{
1756 bgPixmap.render (); 1602 bgPixmap.render ();
1603 refresh_check ();
1757} 1604}
1758 1605
1759#endif /* HAVE_BG_PIXMAP */ 1606#endif /* HAVE_BG_PIXMAP */
1760 1607
1761/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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