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.243 by sasha, Thu Aug 16 21:26:20 2007 UTC vs.
Revision 1.316 by root, Sun Apr 26 01:51:20 2009 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 ();
231 242
232#ifdef USE_XIM 243#ifdef USE_XIM
233 im_destroy (); 244 im_destroy ();
234#endif 245#endif
235#ifdef XTERM_SCROLLBAR 246 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); 247 if (gc) XFreeGC (dpy, gc);
260 248
261 delete drawable; 249 delete drawable;
262 // destroy all windows 250 // destroy all windows
263 if (parent[0]) 251 if (parent[0])
… …
271 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
272#endif 260#endif
273 } 261 }
274 262
275 clear (); 263 clear ();
276 }
277 264
278 delete [] pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 266 displays.put (display);
267 }
284 268
285 scr_release (); 269 scr_release ();
286 270
287 /* clear all resources */ 271 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
… …
300 delete argv; 284 delete argv;
301 285
302#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
303 delete keyboard; 287 delete keyboard;
304#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
305} 292}
306 293
307// child has exited, usually destroys 294// child has exited, usually destroys
308void 295void
309rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
310{ 297{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 299
313 cmd_pid = 0; 300 cmd_pid = 0;
314 301
… …
317} 304}
318 305
319void 306void
320rxvt_term::destroy () 307rxvt_term::destroy ()
321{ 308{
322 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
323 return; 310 return;
324 311
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 313
327#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
… …
331 if (display) 318 if (display)
332 { 319 {
333#if USE_XIM 320#if USE_XIM
334 im_ev.stop (display); 321 im_ev.stop (display);
335#endif 322#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
341#endif 326#endif
342 incr_ev.stop (); 327 incr_ev.stop ();
343 termwin_ev.stop (display); 328 termwin_ev.stop (display);
344 vt_ev.stop (display); 329 vt_ev.stop (display);
345 } 330 }
346 331
347 check_ev.stop (); 332 flush_ev.stop ();
348 pty_ev.stop (); 333 pty_ev.stop ();
349#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
351#endif 336#endif
352#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
360#endif 345#endif
361#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
362 pointer_ev.stop (); 347 pointer_ev.stop ();
363#endif 348#endif
364 349
365 destroy_ev.start (0); 350 destroy_ev.start ();
366} 351}
367 352
368void 353void
369rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 355{
371 make_current (); 356 make_current ();
372 357
373 delete this; 358 delete this;
374} 359}
… …
428 else 413 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 415 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 417 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 419 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 421}
437#endif 422#endif
438 423
… …
462 DisplayString (display)); 447 DisplayString (display));
463 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
465} 450}
466 451
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 XPM_BACKGROUND
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 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least */
549 if (!bgPixmap.window_size_sensitive ())
550 update_background();
551#endif
552 }
553#endif
554
555#if ENABLE_PERL
556 rootwin_ev.start (display, display->root);
557#endif
558
559 set_colorfgbg ();
560
561 init_command (cmd_argv);
562
563 free (cmd_argv);
564
565 if (pty->pty >= 0)
566 pty_ev.start (pty->pty, EVENT_READ);
567
568 check_ev.start ();
569
570 HOOK_INVOKE ((this, HOOK_START, DT_END));
571
572#if ENABLE_XEMBED
573 if (rs[Rs_embed])
574 {
575 long info[2] = { 0, XEMBED_MAPPED };
576
577 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
578 32, PropModeReplace, (unsigned char *)&info, 2);
579 }
580#endif
581
582 XMapWindow (dpy, vt);
583 XMapWindow (dpy, parent[0]);
584
585 return true;
586}
587
588static struct sig_handlers 452static struct sig_handlers
589{ 453{
590 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
591 455
592 /* 456 /*
593 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
594 */ 458 */
595 void 459 void sig_term (ev::sig &w, int revents);
596 sig_term (sig_watcher &w) 460
461 sig_handlers ()
597 { 462 {
598 rxvt_emergency_cleanup (); 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
599 signal (w.signum, SIG_DFL);
600 kill (getpid (), w.signum);
601 }
602
603 sig_handlers ()
604 : sw_term (this, &sig_handlers::sig_term),
605 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
606 {
607 } 465 }
608} sig_handlers; 466} sig_handlers;
609 467
468void
469sig_handlers::sig_term (ev::sig &w, int revents)
470{
471 rxvt_emergency_cleanup ();
472 w.stop ();
473 kill (getpid (), w.signum);
474}
475
610char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
611 477
612void 478void
613rxvt_init () 479rxvt_init ()
614{ 480{
615 ptytty::init (); 481 ptytty::init ();
482
483 if (!ev_default_loop (0))
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
616 485
617 rxvt_environ = environ; 486 rxvt_environ = environ;
618 487
619 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
620 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
621 490
622 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
623 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
624 493
625 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
626 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
627 496
628 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
629 // TODO: handle this with exceptions and tolerate the memory loss 498 // TODO: handle this with exceptions and tolerate the memory loss
630 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
631 500
632 XrmInitialize (); 501 XrmInitialize ();
633}
634
635/* ------------------------------------------------------------------------- *
636 * MEMORY ALLOCATION WRAPPERS *
637 * ------------------------------------------------------------------------- */
638void *
639rxvt_malloc (size_t size)
640{
641 void *p = malloc (size);
642
643 if (!p)
644 rxvt_fatal ("memory allocation failure. aborting.\n");
645
646 return p;
647}
648
649void *
650rxvt_calloc (size_t number, size_t size)
651{
652 void *p = calloc (number, size);
653
654 if (!p)
655 rxvt_fatal ("memory allocation failure. aborting.\n");
656
657 return p;
658}
659
660void *
661rxvt_realloc (void *ptr, size_t size)
662{
663 void *p = realloc (ptr, size);
664
665 if (!p)
666 rxvt_fatal ("memory allocation failure. aborting.\n");
667
668 return p;
669} 502}
670 503
671/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
672/* 505/*
673 * window size/position calculations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
… …
675 */ 508 */
676void 509void
677rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
678{ 511{
679 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
680 int x, y, sb_w, flags; 513 int x, y, flags;
681 unsigned int w, h; 514 unsigned int w, h;
682 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
683 516
684 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
685 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
… …
695 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
696 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
697 530
698 if (flags & WidthValue) 531 if (flags & WidthValue)
699 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
700 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
701 szHint.flags |= USSize; 537 szHint.flags |= USSize;
702 } 538 }
703 539
704 if (flags & HeightValue) 540 if (flags & HeightValue)
705 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
706 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
707 szHint.flags |= USSize; 546 szHint.flags |= USSize;
708 } 547 }
709 548
710 if (flags & XValue) 549 if (flags & XValue)
711 { 550 {
… …
742 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
743 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
744 583
745 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
746 585
747 sb_w = 0;
748 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
749 587
750 if (scrollBar.state) 588 if (scrollBar.state)
751 { 589 {
752 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
753 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
754 592
755 if (!option (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
756 window_vt_x += sb_w; 594 window_vt_x += sb_w;
757 } 595 }
… …
781 { 619 {
782 min_it (height, max_height); 620 min_it (height, max_height);
783 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
784 } 622 }
785 623
786 if (scrollBar.state && option (Opt_scrollBar_right))
787 window_sb_x = szHint.width - sb_w;
788
789 if (recalc_x) 624 if (recalc_x)
790 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
791 626
792 if (recalc_y) 627 if (recalc_y)
793 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
794 629
795 ncol = width / fwidth; 630 ncol = width / fwidth;
796 nrow = height / fheight; 631 nrow = height / fheight;
797} 632}
798 633
799/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
800/* 635/*
… …
814 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
815 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
816 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
817 652
818#if 0 653#if 0
819 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
820 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
821 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
822#endif 657#endif
823} 658}
824 659
… …
898 if (parent[0]) 733 if (parent[0])
899 { 734 {
900 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
901 scr_remap_chars (); 736 scr_remap_chars ();
902 scr_touch (true); 737 scr_touch (true);
903 } 738 }
904 739
905 return true; 740 return true;
906} 741}
907 742
743void
908void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
909{ 745{
910 XChangeProperty (dpy, parent[0], 746 XChangeProperty (dpy, parent[0],
911 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
912 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
913} 749}
914 750
751void
915void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
916{ 753{
917 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
918 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
919 756
920 XChangeProperty (dpy, parent[0], 757 XChangeProperty (dpy, parent[0],
… …
944#if ENABLE_EWMH 781#if ENABLE_EWMH
945 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
946#endif 783#endif
947} 784}
948 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
949#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
953 rxvt_color xcol; 790 rxvt_color xcol;
954 int i; 791
955
956 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
957 return; 793 return;
958 794
959 color = strdup (color); 795 color = strdup (color);
960 allocated.push_back ((void *)color); 796 allocated.push_back ((void *)color);
961 rs[Rs_color + idx] = color; 797 rs[Rs_color + idx] = color;
962 798
963 /* handle color aliases */ 799 /* handle color aliases */
964 if (isdigit (*color)) 800 if (isdigit (*color))
965 { 801 {
966 i = atoi (color); 802 int i = atoi (color);
967 803
968 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
969 { /* bright colors */ 806 /* bright colors */
970 i -= 8;
971 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
972 goto done; 808 goto done;
973 } 809 }
974 810
975 if (i >= 0 && i <= 7) 811 if (i >= 0 && i <= 7)
812 {
976 { /* normal colors */ 813 /* normal colors */
977 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
978 goto done; 815 goto done;
979 } 816 }
980 } 817 }
981 818
… …
986 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
987 */ 824 */
988 825
989 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
990 827
991 /* XSetWindowAttributes attr; */
992 /* Cursor cursor; */
993done: 828done:
994 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
995 830
996 update_fade_color (idx); 831 update_fade_color (idx);
997 recolour_cursor (); 832 recolour_cursor ();
998 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
999} 835}
1000
1001#else
1002# define set_window_color (idx,color) ((void)0)
1003#endif /* XTERM_COLOR_CHANGE */
1004 836
1005void 837void
1006rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
1007{ 839{
1008 XColor fg, bg; 840 XColor fg, bg;
… …
1024 */ 856 */
1025void 857void
1026rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
1027{ 859{
1028 unsigned int i; 860 unsigned int i;
1029 const char *xpmb = "\0"; 861 const char *xpmb = "";
1030 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1031 863
1032 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
1033 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
1034 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
… …
1040 872
1041 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
1043 { 875 {
1044 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
1045#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
1046 xpmb = "default;"; 878 xpmb = "default;";
1047#endif 879#endif
1048 break; 880 break;
1049 } 881 }
1050 882
… …
1079 int old_width = szHint.width; 911 int old_width = szHint.width;
1080 int old_height = szHint.height; 912 int old_height = szHint.height;
1081 913
1082 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
1083 915
1084 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint)
920 {
921 szHint.flags &= ~(PBaseSize | PResizeInc);
1085 XSetWMNormalHints (dpy, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1086 925
1087 if (!ignoreparent) 926 if (!ignoreparent)
1088 { 927 {
1089#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1090 /* 929 /*
… …
1130#else 969#else
1131 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1132#endif 971#endif
1133 } 972 }
1134 973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
976
1135 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1136 978
1137 if (fix_screen || newwidth != old_width || newheight != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1138 { 980 {
1139 if (scrollBar.state) 981 if (scrollBar.state)
1140 { 982 scrollBar.resize ();
1141 XMoveResizeWindow (dpy, scrollBar.win,
1142 window_sb_x, 0,
1143 scrollbar_TotalWidth (), szHint.height);
1144 resize_scrollbar ();
1145 }
1146 983
1147 XMoveResizeWindow (dpy, vt, 984 XMoveResizeWindow (dpy, vt,
1148 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1149 width, height); 986 width, height);
1150 987
1151#ifdef XPM_BACKGROUND 988#ifdef HAVE_BG_PIXMAP
1152 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1153 if (bgPixmap.window_size_sensitive ()) 989 if (bgPixmap.window_size_sensitive ())
1154 update_background (); 990 update_background ();
1155#endif 991#endif
1156
1157 scr_clear ();
1158 } 992 }
1159 993
1160 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
1161 scr_reset (); 995 scr_reset ();
1162 996
… …
1241 1075
1242/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1243bool 1077bool
1244rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1245{ 1079{
1246 char *p;
1247 Atom atom; 1080 Atom atom;
1248 Window win; 1081 Window win;
1249 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1250 1083
1251 /* get current locale modifier */ 1084 /* get current locale modifier */
1252 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1253 { 1086 {
1254 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1256 1089
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1258 *p = '\0'; 1091 *p = '\0';
1259 1092
1260 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1262 1095
… …
1345 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1347 } 1180 }
1348 else 1181 else
1349 str = (void *)text->string.wide_char; 1182 str = (void *)text->string.wide_char;
1350 1183
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
1355 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,
… …
1674 1507
1675 if (input_style & XIMPreeditPosition) 1508 if (input_style & XIMPreeditPosition)
1676 { 1509 {
1677 im_set_size (preedit_rect); 1510 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679 1512
1680 XSetICValues (Input_Context, 1513 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL); 1514 XNPreeditAttributes, preedit_attr, NULL);
1682 } 1515 }
1683 else 1516 else
1684 { 1517 {
… …
1701 XFree (status_attr); 1534 XFree (status_attr);
1702 } 1535 }
1703 1536
1704 XFree (preedit_attr); 1537 XFree (preedit_attr);
1705} 1538}
1706#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 */
1707 1607
1708/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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