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.211 by root, Tue Jan 31 16:57:35 2006 UTC vs.
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
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
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 198
189 termlist.push_back (this); 199 termlist.push_back (this);
190 200
191#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
193#endif 203#endif
194} 204}
195 205
196// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 207// for use before an emergency exit
208void
198void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
199{ 210{
200 if (cmd_pid) 211 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
202 213
214 pty_ev.stop ();
203 delete pty; pty = 0; 215 delete pty; pty = 0;
204} 216}
205 217
206rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
207{ 219{
… …
222 234
223#ifdef USE_XIM 235#ifdef USE_XIM
224 im_destroy (); 236 im_destroy ();
225#endif 237#endif
226#ifdef XTERM_SCROLLBAR 238#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 241#endif
230#ifdef PLAIN_SCROLLBAR 242#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 244#endif
233#ifdef NEXT_SCROLLBAR 245#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 246 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 247 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 248 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 249 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 250 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 251 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 252 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 253 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 256#endif
245#ifdef RXVT_SCROLLBAR 257#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 261#endif
250 if (gc) XFreeGC (xdisp, gc); 262 if (gc) XFreeGC (dpy, gc);
251 263
252 delete drawable; 264 delete drawable;
253 // destroy all windows 265 // destroy all windows
254 if (parent[0]) 266 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 267 XDestroyWindow (dpy, parent[0]);
268
269 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i))
271 {
272 pix_colors_focused [i].free (this);
273#if OFF_FOCUS_FADING
274 pix_colors_unfocused [i].free (this);
275#endif
276 }
256 277
257 clear (); 278 clear ();
258 } 279 }
259 280
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 281 delete [] pix_colors_focused;
262#if OFF_FOCUS_FADING 282#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 283 delete [] pix_colors_unfocused;
264#endif 284#endif
265 285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */
266 displays.put (display); 290 displays.put (display);
267 291
268 scr_release (); 292 scr_release ();
269 293
270 /* clear all resources */ 294 /* clear all resources */
… …
283 delete argv; 307 delete argv;
284 308
285#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
286 delete keyboard; 310 delete keyboard;
287#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
288} 315}
289 316
290// child has exited, usually destroys 317// child has exited, usually destroys
291void 318void
292rxvt_term::child_cb (child_watcher &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
293{ 320{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 321 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 322
296 cmd_pid = 0; 323 cmd_pid = 0;
297 324
298 if (!OPTION (Opt_hold)) 325 if (!option (Opt_hold))
299 destroy (); 326 destroy ();
300} 327}
301 328
302void 329void
303rxvt_term::destroy () 330rxvt_term::destroy ()
304{ 331{
305 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
306 return; 333 return;
307 334
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 336
310#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
317 im_ev.stop (display); 344 im_ev.stop (display);
318#endif 345#endif
319#if HAVE_SCROLLBARS 346#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 347 scrollbar_ev.stop (display);
321#endif 348#endif
322#if TRANSPARENT 349#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 350 rootwin_ev.stop (display);
324#endif 351#endif
325 incr_ev.stop (); 352 incr_ev.stop ();
326 termwin_ev.stop (display); 353 termwin_ev.stop (display);
327 vt_ev.stop (display); 354 vt_ev.stop (display);
328 } 355 }
329 356
330 check_ev.stop (); 357 flush_ev.stop ();
331 pty_ev.stop (); 358 pty_ev.stop ();
332#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
334#endif 361#endif
335#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
343#endif 370#endif
344#ifdef POINTER_BLANK 371#ifdef POINTER_BLANK
345 pointer_ev.stop (); 372 pointer_ev.stop ();
346#endif 373#endif
347 374
348 destroy_ev.start (0); 375 destroy_ev.start ();
349} 376}
350 377
351void 378void
352rxvt_term::destroy_cb (time_watcher &w) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 380{
354 make_current (); 381 make_current ();
355 382
356 delete this; 383 delete this;
357} 384}
… …
411 else 438 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 440 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 442 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 444 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 446}
420#endif 447#endif
421 448
… …
446 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
448} 475}
449 476
450/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
451bool 478void
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 480{
454 this->envv = envv; 481 this->envv = envv;
455 482
456 SET_R (this); 483 SET_R (this);
457 set_locale (""); 484 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
459 486
460 if (!init_vars ()) 487 init_vars ();
461 return false;
462 488
463 init_secondary (); 489 init_secondary ();
464 490
465 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
466 492
467#ifdef KEYSYM_RESOURCE 493#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 494 keyboard->register_done ();
469#endif 495#endif
470 496
471#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 498 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 499 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 500#endif
475 501
476 pty = ptytty::create (); 502 pty = ptytty::create ();
477 503
… …
480 init_xlocale (); 506 init_xlocale ();
481 507
482 scr_reset (); // initialize screen 508 scr_reset (); // initialize screen
483 509
484#if 0 510#if 0
485 XSynchronize (xdisp, True); 511 XSynchronize (dpy, True);
486#endif 512#endif
487 513
488#ifdef HAVE_SCROLLBARS 514#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
491#endif 517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
492#ifdef TRANSPARENT 522#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 523 if (option (Opt_transparent))
494 { 524 {
525 bgPixmap.set_transparent ();
526
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
534 if (rs [Rs_shade])
535 bgPixmap.set_shade (rs [Rs_shade]);
536
537 bgPixmap.set_root_pixmap ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 538 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 539 rootwin_ev.start (display, display->root);
498 } 540 }
541#endif
542
543#ifdef BG_IMAGE_FROM_FILE
544 if (rs[Rs_backgroundPixmap])
545 {
546 const char *p = rs[Rs_backgroundPixmap];
547
548 if ((p = strchr (p, ';')) != 0)
549 {
550 p++;
551 bgPixmap.set_geometry (p);
552 }
553 else
554 bgPixmap.set_defaultGeometry ();
555
556 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557 if (!bgPixmap.window_position_sensitive ())
558 update_background ();
559 }
560#endif
561 }
562#endif
563
564#if ENABLE_PERL
565 rootwin_ev.start (display, display->root);
499#endif 566#endif
500 567
501 set_colorfgbg (); 568 set_colorfgbg ();
502 569
503 init_command (cmd_argv); 570 init_command (cmd_argv);
504 571
505 free (cmd_argv); 572 free (cmd_argv);
506 573
507 if (pty->pty >= 0) 574 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ); 575 pty_ev.start (pty->pty, ev::READ);
509
510 check_ev.start ();
511 576
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 578
514#if ENABLE_XEMBED 579#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
516 { 581 {
517 long info[2] = { 0, XEMBED_MAPPED }; 582 long info[2] = { 0, XEMBED_MAPPED };
518 583
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 585 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 586 }
522#endif 587#endif
523 588
524 XMapWindow (xdisp, vt); 589 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 590 XMapWindow (dpy, parent[0]);
526
527 return true;
528} 591}
529 592
530static struct sig_handlers 593static struct sig_handlers
531{ 594{
532 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
533 596
534 /* 597 /*
535 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
536 */ 599 */
537 void 600 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 601
602 sig_handlers ()
539 { 603 {
540 rxvt_emergency_cleanup (); 604 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
541 signal (w.signum, SIG_DFL);
542 kill (getpid (), w.signum);
543 }
544
545 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 605 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 606 }
550} sig_handlers; 607} sig_handlers;
551 608
609void
610sig_handlers::sig_term (ev::sig &w, int revents)
611{
612 rxvt_emergency_cleanup ();
613 w.stop ();
614 kill (getpid (), w.signum);
615}
616
552char **rxvt_environ; // startup environment 617char **rxvt_environ; // startup environment
553 618
554void 619void
555rxvt_init () 620rxvt_init ()
556{ 621{
557 ptytty::init (); 622 ptytty::init ();
623
624 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 626
559 rxvt_environ = environ; 627 rxvt_environ = environ;
560 628
561 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
563 631
564 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566 634
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
569 637
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
572 XSetIOErrorHandler (rxvt_xioerror_handler); 640 XSetIOErrorHandler (rxvt_xioerror_handler);
573 641
574 XrmInitialize (); 642 XrmInitialize ();
575} 643}
576 644
577/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */
580void *
581rxvt_malloc (size_t size)
582{
583 void *p = malloc (size);
584
585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
588 return p;
589}
590
591void *
592rxvt_calloc (size_t number, size_t size)
593{
594 void *p = calloc (number, size);
595
596 if (!p)
597 rxvt_fatal ("memory allocation failure. aborting.\n");
598
599 return p;
600}
601
602void *
603rxvt_realloc (void *ptr, size_t size)
604{
605 void *p = realloc (ptr, size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611}
612
613/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
614/* 646/*
615 * window size/position calculcations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 648 * if width/height are non-zero then override calculated width/height
617 */ 649 */
618void 650void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 651rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 652{
… …
691 723
692 if (scrollBar.state) 724 if (scrollBar.state)
693 { 725 {
694 sb_w = scrollbar_TotalWidth (); 726 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 727 szHint.base_width += sb_w;
728
696 if (!OPTION (Opt_scrollBar_right)) 729 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 730 window_vt_x += sb_w;
698 } 731 }
699 732
700 szHint.width_inc = fwidth; 733 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 734 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 735 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 736 szHint.min_height = szHint.base_height + szHint.height_inc;
704 737
705 if (newwidth && newwidth - szHint.base_width < max_width) 738 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 739 {
707 szHint.width = newwidth; 740 szHint.width = newwidth;
… …
722 { 755 {
723 min_it (height, max_height); 756 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 757 szHint.height = szHint.base_height + height;
725 } 758 }
726 759
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 760 if (scrollBar.state && option (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 761 window_sb_x = szHint.width - sb_w;
729 762
730 if (recalc_x) 763 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 765
733 if (recalc_y) 766 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 768
736 ncol = width / fwidth; 769 ncol = width / fwidth;
737 nrow = height / fheight; 770 nrow = height / fheight;
738} 771}
739 772
… …
755 ws.ws_xpixel = width; 788 ws.ws_xpixel = width;
756 ws.ws_ypixel = height; 789 ws.ws_ypixel = height;
757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 790 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
758 791
759#if 0 792#if 0
760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 793 // TIOCSWINSZ is supposed to do this automatically and correctly
761 if (cmd_pid) /* force through to the command */ 794 if (cmd_pid) /* force through to the command */
762 kill (-cmd_pid, SIGWINCH); 795 kill (-cmd_pid, SIGWINCH);
763#endif 796#endif
764} 797}
765 798
… …
794 delete fontset[0]; 827 delete fontset[0];
795 fontset[0] = fs; 828 fontset[0] = fs;
796 829
797 prop = (*fs)[1]->properties (); 830 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 831 prop.height += lineSpace;
832
799 fs->set_prop (prop); 833 fs->set_prop (prop, false);
800 834
801 fwidth = prop.width; 835 fwidth = prop.width;
802 fheight = prop.height; 836 fheight = prop.height;
803 fbase = prop.ascent; 837 fbase = prop.ascent;
804 838
… …
813 { 847 {
814 fontset[style] = fs = new rxvt_fontset (this); 848 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 849 rxvt_fontprop prop2 = prop;
816 850
817 if (res) 851 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 852 {
853 fs->populate (res);
854 fs->set_prop (prop2, false);
855 }
819 else 856 else
820 { 857 {
821 res = fontset[0]->fontdesc; 858 fs->populate (fontset[0]->fontdesc);
822 859
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 860 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 861 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
862
863 fs->set_prop (prop2, true);
825 } 864 }
826 865
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 866 }
830#else 867#else
831 fontset[style] = fontset[0]; 868 fontset[style] = fontset[0];
832#endif 869#endif
833 } 870 }
… …
835 if (parent[0]) 872 if (parent[0])
836 { 873 {
837 resize_all_windows (0, 0, 0); 874 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 875 scr_remap_chars ();
839 scr_touch (true); 876 scr_touch (true);
840 } 877 }
841 878
842 return true; 879 return true;
843} 880}
844 881
882void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 883rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 884{
847 XChangeProperty (xdisp, parent[0], 885 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 886 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 887 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 888}
851 889
890void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 891rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 892{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 893 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 894 char *s = rxvt_wcstoutf8 (ws);
856 895
857 XChangeProperty (xdisp, parent[0], 896 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 897 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 898 (const unsigned char *)s, strlen (s));
860 899
861 free (s); 900 free (s);
862 free (ws); 901 free (ws);
… …
881#if ENABLE_EWMH 920#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 921 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 922#endif
884} 923}
885 924
925void
926rxvt_term::set_window_color (int idx, const char *color)
927{
886#ifdef XTERM_COLOR_CHANGE 928#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 929 rxvt_color xcol;
891 int i; 930 int i;
892 931
893 if (color == NULL || *color == '\0') 932 if (color == NULL || *color == '\0')
894 return; 933 return;
895 934
935 color = strdup (color);
936 allocated.push_back ((void *)color);
937 rs[Rs_color + idx] = color;
938
896 /* handle color aliases */ 939 /* handle color aliases */
897 if (isdigit (*color)) 940 if (isdigit (*color))
898 { 941 {
899 i = atoi (color); 942 i = atoi (color);
900 943
901 if (i >= 8 && i <= 15) 944 if (i >= 8 && i <= 15)
945 {
902 { /* bright colors */ 946 /* bright colors */
903 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
905 SET_PIXCOLOR (idx);
906 goto done; 948 goto done;
907 } 949 }
908 950
909 if (i >= 0 && i <= 7) 951 if (i >= 0 && i <= 7)
952 {
910 { /* normal colors */ 953 /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 954 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 955 goto done;
914 } 956 }
915 } 957 }
916 958
917 if (!set_color (xcol, color)) 959 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 960
922 /* 961 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 962 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 963 * so just keep gobbling up the colormap
925 */ 964 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (xdisp, display->screen));
935 }
936# endif
937 965
938 pix_colors_focused[idx] = xcol; 966 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 967
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 968done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 {
948 rxvt_rgba c;
949 pix_colors [Color_fade].get (this, c);
950 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
951 }
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 969 /*TODO: handle Color_BD, scrollbar background, etc. */
955 970
971 update_fade_color (idx);
956 recolour_cursor (); 972 recolour_cursor ();
957 scr_recolour (); 973 scr_recolour ();
974#endif /* XTERM_COLOR_CHANGE */
958} 975}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 976
964void 977void
965rxvt_term::recolour_cursor () 978rxvt_term::recolour_cursor ()
966{ 979{
967 XColor xcol[2]; 980 XColor fg, bg;
968 981
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 982 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 983 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 984 : pix_colors_focused[Color_fg]).get (fg);
985
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 986 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 987 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 988 : pix_colors_focused[Color_bg]).get (bg);
975 989
976 XQueryColors (xdisp, cmap, xcol, 2);
977 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 990 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978} 991}
979 992
980/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
981/* 994/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 995 * find if fg/bg matches any of the normal (low-intensity) colors
983 */ 996 */
984void 997void
985rxvt_term::set_colorfgbg () 998rxvt_term::set_colorfgbg ()
986{ 999{
987 unsigned int i; 1000 unsigned int i;
988 const char *xpmb = "\0"; 1001 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 1003
991 strcpy (fstr, "default"); 1004 strcpy (fstr, "default");
992 strcpy (bstr, "default"); 1005 strcpy (bstr, "default");
993 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
… …
999 1012
1000 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1015 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1016 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1017#ifdef BG_IMAGE_FROM_FILE
1005 xpmb = "default;"; 1018 xpmb = "default;";
1006#endif 1019#endif
1007 break; 1020 break;
1008 } 1021 }
1009 1022
… …
1018 if (color.set (this, name)) 1031 if (color.set (this, name))
1019 return true; 1032 return true;
1020 1033
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1034 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false; 1035 return false;
1036}
1037
1038void
1039rxvt_term::alias_color (int dst, int src)
1040{
1041 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1042}
1024 1043
1025/* -------------------------------------------------------------------- * 1044/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1045 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1046 * -------------------------------------------------------------------- */
… …
1031 int fix_screen; 1050 int fix_screen;
1032 int old_width = szHint.width; 1051 int old_width = szHint.width;
1033 int old_height = szHint.height; 1052 int old_height = szHint.height;
1034 1053
1035 window_calc (newwidth, newheight); 1054 window_calc (newwidth, newheight);
1055
1056 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1036 XSetWMNormalHints (xdisp, parent[0], &szHint); 1057 XSetWMNormalHints (dpy, parent[0], &szHint);
1037 1058
1038 if (!ignoreparent) 1059 if (!ignoreparent)
1039 { 1060 {
1040#ifdef SMART_RESIZE 1061#ifdef SMART_RESIZE
1041 /* 1062 /*
… …
1045 int x, y, x1, y1; 1066 int x, y, x1, y1;
1046 int dx, dy; 1067 int dx, dy;
1047 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1068 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1048 Window unused_cr; 1069 Window unused_cr;
1049 1070
1050 XTranslateCoordinates (xdisp, parent[0], display->root, 1071 XTranslateCoordinates (dpy, parent[0], display->root,
1051 0, 0, &x, &y, &unused_cr); 1072 0, 0, &x, &y, &unused_cr);
1052 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1073 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1053 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1074 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1054 /* 1075 /*
1055 * if display->root isn't the parent window, a WM will probably have offset 1076 * if display->root isn't the parent window, a WM will probably have offset
1056 * our position for handles and decorations. Counter it 1077 * our position for handles and decorations. Counter it
1057 */ 1078 */
… …
1059 { 1080 {
1060 x -= x1; 1081 x -= x1;
1061 y -= y1; 1082 y -= y1;
1062 } 1083 }
1063 1084
1064 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1085 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1065 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1086 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1066 dx = old_width - szHint.width; 1087 dx = old_width - szHint.width;
1067 dy = old_height - szHint.height; 1088 dy = old_height - szHint.height;
1068 1089
1069 /* Check position of the center of the window */ 1090 /* Check position of the center of the window */
1070 if (x < x1) /* left half */ 1091 if (x < x1) /* left half */
… …
1074 if (y < y1) /* top half */ 1095 if (y < y1) /* top half */
1075 dy = 0; 1096 dy = 0;
1076 else if (y == y1) /* exact center */ 1097 else if (y == y1) /* exact center */
1077 dy /= 2; 1098 dy /= 2;
1078 1099
1079 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1100 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1080 szHint.width, szHint.height); 1101 szHint.width, szHint.height);
1081#else 1102#else
1082 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1103 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1083#endif 1104#endif
1084 } 1105 }
1085 1106
1086 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1107 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1087 1108
1088 if (fix_screen || newwidth != old_width || newheight != old_height) 1109 if (fix_screen || newwidth != old_width || newheight != old_height)
1089 { 1110 {
1090 if (scrollBar.state) 1111 if (scrollBar.state)
1091 { 1112 {
1092 XMoveResizeWindow (xdisp, scrollBar.win, 1113 XMoveResizeWindow (dpy, scrollBar.win,
1093 window_sb_x, 0, 1114 window_sb_x, 0,
1094 scrollbar_TotalWidth (), szHint.height); 1115 scrollbar_TotalWidth (), szHint.height);
1095 resize_scrollbar (); 1116 resize_scrollbar ();
1096 } 1117 }
1097 1118
1098 XMoveResizeWindow (xdisp, vt, 1119 XMoveResizeWindow (dpy, vt,
1099 window_vt_x, window_vt_y, 1120 window_vt_x, window_vt_y,
1100 width, height); 1121 width, height);
1101 1122
1123#ifdef HAVE_BG_PIXMAP
1124 if (bgPixmap.window_size_sensitive ())
1125 update_background ();
1126#endif
1127
1102 scr_clear (); 1128 scr_clear ();
1103#ifdef XPM_BACKGROUND
1104 resize_pixmap ();
1105#endif
1106 } 1129 }
1107 1130
1108 if (fix_screen || old_height == 0) 1131 if (fix_screen || old_height == 0)
1109 scr_reset (); 1132 scr_reset ();
1110 1133
1111#ifdef XPM_BACKGROUND 1134 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1112 if (pixmap) 1135 //scr_touch (false);
1136
1137#ifdef HAVE_BG_PIXMAP
1138// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1139// if (bgPixmap.pixmap)
1113 scr_touch (false); 1140// scr_touch (false);
1114#endif 1141#endif
1115 1142
1116#ifdef USE_XIM 1143#ifdef USE_XIM
1117 IMSetStatusPosition (); 1144 IMSetPosition ();
1118#endif 1145#endif
1119} 1146}
1120 1147
1121/* 1148/*
1122 * Set the width/height of the vt window in characters. Units are pixels. 1149 * Set the width/height of the vt window in characters. Units are pixels.
… …
1127{ 1154{
1128 XWindowAttributes wattr; 1155 XWindowAttributes wattr;
1129 1156
1130 if (newwidth == 0 || newheight == 0) 1157 if (newwidth == 0 || newheight == 0)
1131 { 1158 {
1132 XGetWindowAttributes (xdisp, display->root, &wattr); 1159 XGetWindowAttributes (dpy, display->root, &wattr);
1133 1160
1134 if (newwidth == 0) 1161 if (newwidth == 0)
1135 newwidth = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1136 if (newheight == 0) 1163 if (newheight == 0)
1137 newheight = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
… …
1151#ifdef USE_XIM 1178#ifdef USE_XIM
1152 1179
1153void 1180void
1154rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1155{ 1182{
1156 fg = pix_colors[Color_fg]; 1183 fg = pix_colors [Color_fg];
1157 bg = pix_colors[Color_bg]; 1184 bg = pix_colors [Color_bg];
1158} 1185}
1159 1186
1160void 1187void
1161rxvt_term::im_set_size (XRectangle &size) 1188rxvt_term::im_set_size (XRectangle &size)
1162{ 1189{
… …
1199 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1226 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1200 1227
1201 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1228 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1202 *p = '\0'; 1229 *p = '\0';
1203 1230
1204 atom = XInternAtom (xdisp, server, False); 1231 atom = XInternAtom (dpy, server, False);
1205 win = XGetSelectionOwner (xdisp, atom); 1232 win = XGetSelectionOwner (dpy, atom);
1206 1233
1207 if (win != None) 1234 if (win != None)
1208 return True; 1235 return True;
1209 } 1236 }
1210 1237
… …
1289 if (term->rs[Rs_imLocale]) 1316 if (term->rs[Rs_imLocale])
1290 SET_LOCALE (term->locale); 1317 SET_LOCALE (term->locale);
1291 } 1318 }
1292 else 1319 else
1293 str = (void *)text->string.wide_char; 1320 str = (void *)text->string.wide_char;
1294 1321
1295 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1322 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1296 DT_INT, call_data->caret, 1323 DT_INT, call_data->caret,
1297 DT_INT, call_data->chg_first, 1324 DT_INT, call_data->chg_first,
1298 DT_INT, call_data->chg_length, 1325 DT_INT, call_data->chg_length,
1299 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1326 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1434 "*", 1461 "*",
1435 fheight, 1462 fheight,
1436 fheight + 1, fheight - 1, 1463 fheight + 1, fheight - 1,
1437 fheight - 2, fheight + 2); 1464 fheight - 2, fheight + 2);
1438 1465
1439 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1466 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1440 &missing_charset_list, &missing_charset_count, &def_string); 1467 &missing_charset_list, &missing_charset_count, &def_string);
1441 1468
1442 if (missing_charset_list) 1469 if (missing_charset_list)
1443 XFreeStringList (missing_charset_list); 1470 XFreeStringList (missing_charset_list);
1444 1471
… …
1519 preedit_attr, 1546 preedit_attr,
1520 status_attr ? XNStatusAttributes : NULL, 1547 status_attr ? XNStatusAttributes : NULL,
1521 status_attr, NULL); 1548 status_attr, NULL);
1522 1549
1523 if (preedit_attr) XFree (preedit_attr); 1550 if (preedit_attr) XFree (preedit_attr);
1524 if (status_attr) XFree (status_attr); 1551 if (status_attr) XFree (status_attr);
1525 if (fs) XFreeFontSet (xdisp, fs); 1552 if (fs) XFreeFontSet (dpy, fs);
1526 1553
1527 if (Input_Context == NULL) 1554 if (Input_Context == NULL)
1528 { 1555 {
1529 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1556 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1530 im_destroy (); 1557 im_destroy ();
… …
1535 // unfortunately, only the focus window is used by XIM, hard to fix 1562 // unfortunately, only the focus window is used by XIM, hard to fix
1536 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1563 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1537 vt_select_input (); 1564 vt_select_input ();
1538#endif 1565#endif
1539 1566
1540 if (input_style & XIMPreeditArea)
1541 IMSetStatusPosition (); 1567 IMSetPosition ();
1542 1568
1543 return true; 1569 return true;
1544} 1570}
1545 1571
1546void 1572void
… …
1604 SET_LOCALE (locale); 1630 SET_LOCALE (locale);
1605#endif 1631#endif
1606} 1632}
1607 1633
1608void 1634void
1609rxvt_term::IMSetStatusPosition () 1635rxvt_term::IMSetPosition ()
1610{ 1636{
1611 XRectangle preedit_rect, status_rect, *needed_rect; 1637 XRectangle preedit_rect, status_rect, *needed_rect;
1612 XVaNestedList preedit_attr, status_attr; 1638 XVaNestedList preedit_attr, status_attr;
1613 1639
1614 if (!Input_Context 1640 if (!Input_Context
1615 || !focus 1641 || !focus
1616 || !(input_style & XIMPreeditArea) 1642 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1617 || !IMisRunning ()) 1643 || !IMisRunning ())
1618 return; 1644 return;
1619 1645
1646 if (input_style & XIMPreeditPosition)
1647 {
1648 im_set_size (preedit_rect);
1649 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1650
1651 XSetICValues (Input_Context,
1652 XNPreeditAttributes, preedit_attr, NULL);
1653 }
1654 else
1655 {
1620 /* Getting the necessary width of preedit area */ 1656 /* Getting the necessary width of preedit area */
1621 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1657 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1622 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1658 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1623 XFree (status_attr); 1659 XFree (status_attr);
1624 1660
1625 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1661 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1626 XFree (needed_rect); 1662 XFree (needed_rect);
1627 1663
1628 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1664 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1629 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1665 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1630 1666
1631 XSetICValues (Input_Context, 1667 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, 1668 XNPreeditAttributes, preedit_attr,
1633 XNStatusAttributes, status_attr, NULL); 1669 XNStatusAttributes, status_attr,
1670 NULL);
1634 1671
1672 XFree (status_attr);
1673 }
1674
1635 XFree (preedit_attr); 1675 XFree (preedit_attr);
1636 XFree (status_attr);
1637} 1676}
1638#endif /* USE_XIM */ 1677#endif /* USE_XIM */
1678
1679void
1680rxvt_term::get_window_origin (int &x, int &y)
1681{
1682 Window cr;
1683 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1684/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1685}
1686
1687Pixmap
1688rxvt_term::get_pixmap_property (int prop_id)
1689{
1690 if (prop_id > 0 && prop_id < NUM_XA)
1691 if (xa[prop_id])
1692 {
1693 int aformat;
1694 unsigned long nitems, bytes_after;
1695 Atom atype;
1696 unsigned char *prop = NULL;
1697 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1698 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1699 &nitems, &bytes_after, &prop);
1700 if (result == Success && prop && atype == XA_PIXMAP)
1701 return *(Pixmap *)prop;
1702 }
1703
1704 return None;
1705}
1706
1707#ifdef HAVE_BG_PIXMAP
1708# if TRACE_PIXMAPS
1709# undef update_background
1710void
1711rxvt_term::trace_update_background (const char *file, int line)
1712{
1713 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1714 update_background ();
1715}
1716# endif
1717
1718void
1719rxvt_term::update_background ()
1720{
1721 bgPixmap.invalidate ();
1722
1723 /* no chance of real time refresh if we are blurring! */
1724 if (bgPixmap.invalid_since + 0.50 < ev::now ()
1725 && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1726 {
1727 update_background_ev.stop ();
1728 bgPixmap.render ();
1729 }
1730 else
1731 {
1732 ev_tstamp refresh;
1733
1734 if (!bgPixmap.need_client_side_rendering ())
1735 refresh = .05;
1736 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1737 refresh = .20; /* very slow !!! */
1738 else
1739 refresh = .07;
1740
1741 update_background_ev.start (refresh);
1742 }
1743}
1744
1745void
1746rxvt_term::update_background_cb (ev::timer &w, int revents)
1747{
1748 make_current ();
1749 bgPixmap.render ();
1750 refresh_check ();
1751}
1752
1753#endif /* HAVE_BG_PIXMAP */
1639 1754
1640/*----------------------- end-of-file (C source) -----------------------*/ 1755/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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