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.214 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.286 by root, Sun Dec 16 19:44:48 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::x_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#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 536 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
498 } 538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
499#endif 564#endif
500 565
501 set_colorfgbg (); 566 set_colorfgbg ();
502 567
503 init_command (cmd_argv); 568 init_command (cmd_argv);
504 569
505 free (cmd_argv); 570 free (cmd_argv);
506 571
507 if (pty->pty >= 0) 572 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
509
510 check_ev.start ();
511 574
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 576
514#if ENABLE_XEMBED 577#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
516 { 579 {
517 long info[2] = { 0, XEMBED_MAPPED }; 580 long info[2] = { 0, XEMBED_MAPPED };
518 581
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 583 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 584 }
522#endif 585#endif
523 586
524 XMapWindow (xdisp, vt); 587 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 588 XMapWindow (dpy, parent[0]);
526
527 return true;
528} 589}
529 590
530static struct sig_handlers 591static struct sig_handlers
531{ 592{
532 sig_watcher sw_term, sw_int; 593 ev::sig sw_term, sw_int;
533 594
534 /* 595 /*
535 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
536 */ 597 */
537 void 598 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 599
600 sig_handlers ()
539 { 601 {
540 rxvt_emergency_cleanup (); 602 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) 603 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 604 }
550} sig_handlers; 605} sig_handlers;
551 606
607void
608sig_handlers::sig_term (ev::sig &w, int revents)
609{
610 rxvt_emergency_cleanup ();
611 w.stop ();
612 kill (getpid (), w.signum);
613}
614
552char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
553 616
554void 617void
555rxvt_init () 618rxvt_init ()
556{ 619{
557 ptytty::init (); 620 ptytty::init ();
621
622 if (!ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 624
559 rxvt_environ = environ; 625 rxvt_environ = environ;
560 626
561 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
563 629
564 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566 632
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
569 635
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
610 return p; 676 return p;
611} 677}
612 678
613/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
614/* 680/*
615 * window size/position calculcations for XSizeHint and other storage. 681 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 682 * if width/height are non-zero then override calculated width/height
617 */ 683 */
618void 684void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 686{
… …
692 if (scrollBar.state) 758 if (scrollBar.state)
693 { 759 {
694 sb_w = scrollbar_TotalWidth (); 760 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 761 szHint.base_width += sb_w;
696 762
697 if (!OPTION (Opt_scrollBar_right)) 763 if (!option (Opt_scrollBar_right))
698 window_vt_x += sb_w; 764 window_vt_x += sb_w;
699 } 765 }
700 766
701 szHint.width_inc = fwidth; 767 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 768 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 769 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 770 szHint.min_height = szHint.base_height + szHint.height_inc;
705 771
706 if (newwidth && newwidth - szHint.base_width < max_width) 772 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 773 {
708 szHint.width = newwidth; 774 szHint.width = newwidth;
… …
723 { 789 {
724 min_it (height, max_height); 790 min_it (height, max_height);
725 szHint.height = szHint.base_height + height; 791 szHint.height = szHint.base_height + height;
726 } 792 }
727 793
728 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 794 if (scrollBar.state && option (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w; 795 window_sb_x = szHint.width - sb_w;
730 796
731 if (recalc_x) 797 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 799
734 if (recalc_y) 800 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 802
737 ncol = width / fwidth; 803 ncol = width / fwidth;
738 nrow = height / fheight; 804 nrow = height / fheight;
739} 805}
740 806
… …
756 ws.ws_xpixel = width; 822 ws.ws_xpixel = width;
757 ws.ws_ypixel = height; 823 ws.ws_ypixel = height;
758 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
759 825
760#if 0 826#if 0
761 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 827 // TIOCSWINSZ is supposed to do this automatically and correctly
762 if (cmd_pid) /* force through to the command */ 828 if (cmd_pid) /* force through to the command */
763 kill (-cmd_pid, SIGWINCH); 829 kill (-cmd_pid, SIGWINCH);
764#endif 830#endif
765} 831}
766 832
… …
795 delete fontset[0]; 861 delete fontset[0];
796 fontset[0] = fs; 862 fontset[0] = fs;
797 863
798 prop = (*fs)[1]->properties (); 864 prop = (*fs)[1]->properties ();
799 prop.height += lineSpace; 865 prop.height += lineSpace;
866
800 fs->set_prop (prop); 867 fs->set_prop (prop, false);
801 868
802 fwidth = prop.width; 869 fwidth = prop.width;
803 fheight = prop.height; 870 fheight = prop.height;
804 fbase = prop.ascent; 871 fbase = prop.ascent;
805 872
… …
814 { 881 {
815 fontset[style] = fs = new rxvt_fontset (this); 882 fontset[style] = fs = new rxvt_fontset (this);
816 rxvt_fontprop prop2 = prop; 883 rxvt_fontprop prop2 = prop;
817 884
818 if (res) 885 if (res)
819 prop2.weight = prop2.slant = rxvt_fontprop::unset; 886 {
887 fs->populate (res);
888 fs->set_prop (prop2, false);
889 }
820 else 890 else
821 { 891 {
822 res = fontset[0]->fontdesc; 892 fs->populate (fontset[0]->fontdesc);
823 893
824 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 894 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
825 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 895 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
896
897 fs->set_prop (prop2, true);
826 } 898 }
827 899
828 fs->populate (res);
829 fs->set_prop (prop2);
830 } 900 }
831#else 901#else
832 fontset[style] = fontset[0]; 902 fontset[style] = fontset[0];
833#endif 903#endif
834 } 904 }
… …
836 if (parent[0]) 906 if (parent[0])
837 { 907 {
838 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
839 scr_remap_chars (); 909 scr_remap_chars ();
840 scr_touch (true); 910 scr_touch (true);
841 } 911 }
842 912
843 return true; 913 return true;
844} 914}
845 915
916void
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 918{
848 XChangeProperty (xdisp, parent[0], 919 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 922}
852 923
924void
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 926{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
857 929
858 XChangeProperty (xdisp, parent[0], 930 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 931 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 932 (const unsigned char *)s, strlen (s));
861 933
862 free (s); 934 free (s);
863 free (ws); 935 free (ws);
… …
882#if ENABLE_EWMH 954#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
884#endif 956#endif
885} 957}
886 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
887#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
888void
889rxvt_term::set_window_color (int idx, const char *color)
890{
891 rxvt_color xcol; 963 rxvt_color xcol;
892 int i; 964 int i;
893 965
894 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
895 return; 967 return;
896 968
897 color = strdup (color); 969 color = strdup (color);
898 allocated.push_back ((void *)color); 970 allocated.push_back ((void *)color);
… …
902 if (isdigit (*color)) 974 if (isdigit (*color))
903 { 975 {
904 i = atoi (color); 976 i = atoi (color);
905 977
906 if (i >= 8 && i <= 15) 978 if (i >= 8 && i <= 15)
979 {
907 { /* bright colors */ 980 /* bright colors */
908 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
910 goto done; 982 goto done;
911 } 983 }
912 984
913 if (i >= 0 && i <= 7) 985 if (i >= 0 && i <= 7)
986 {
914 { /* normal colors */ 987 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 988 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 goto done; 989 goto done;
917 } 990 }
918 } 991 }
919 992
… …
924 * so just keep gobbling up the colormap 997 * so just keep gobbling up the colormap
925 */ 998 */
926 999
927 pix_colors_focused[idx] = xcol; 1000 pix_colors_focused[idx] = xcol;
928 1001
929 /* XSetWindowAttributes attr; */
930 /* Cursor cursor; */
931done: 1002done:
932
933#if OFF_FOCUS_FADING
934 if (rs[Rs_fade])
935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
940#endif
941
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
943 1004
1005 update_fade_color (idx);
944 recolour_cursor (); 1006 recolour_cursor ();
945 scr_recolour (); 1007 scr_recolour ();
1008#endif /* XTERM_COLOR_CHANGE */
946} 1009}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 1010
952void 1011void
953rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
954{ 1013{
955 XColor xcol[2]; 1014 XColor fg, bg;
956 1015
957 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1016 (ISSET_PIXCOLOR (Color_pointer_fg)
958 ? pix_colors_focused[Color_pointer_fg] 1017 ? pix_colors_focused[Color_pointer_fg]
959 : pix_colors_focused[Color_fg]; 1018 : pix_colors_focused[Color_fg]).get (fg);
1019
960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1020 (ISSET_PIXCOLOR (Color_pointer_bg)
961 ? pix_colors_focused[Color_pointer_bg] 1021 ? pix_colors_focused[Color_pointer_bg]
962 : pix_colors_focused[Color_bg]; 1022 : pix_colors_focused[Color_bg]).get (bg);
963 1023
964 XQueryColors (xdisp, cmap, xcol, 2);
965 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 1024 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 1025}
967 1026
968/*----------------------------------------------------------------------*/ 1027/*----------------------------------------------------------------------*/
969/* 1028/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 1029 * find if fg/bg matches any of the normal (low-intensity) colors
971 */ 1030 */
972void 1031void
973rxvt_term::set_colorfgbg () 1032rxvt_term::set_colorfgbg ()
974{ 1033{
975 unsigned int i; 1034 unsigned int i;
976 const char *xpmb = "\0"; 1035 const char *xpmb = "";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
978 1037
979 strcpy (fstr, "default"); 1038 strcpy (fstr, "default");
980 strcpy (bstr, "default"); 1039 strcpy (bstr, "default");
981 for (i = Color_Black; i <= Color_White; i++) 1040 for (i = Color_Black; i <= Color_White; i++)
… …
987 1046
988 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1048 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1049 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1050 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1051#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1052 xpmb = "default;";
994#endif 1053#endif
995 break; 1054 break;
996 } 1055 }
997 1056
… …
1006 if (color.set (this, name)) 1065 if (color.set (this, name))
1007 return true; 1066 return true;
1008 1067
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1068 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 1069 return false;
1070}
1071
1072void
1073rxvt_term::alias_color (int dst, int src)
1074{
1075 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1011} 1076}
1012 1077
1013/* -------------------------------------------------------------------- * 1078/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 1079 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 1080 * -------------------------------------------------------------------- */
… …
1019 int fix_screen; 1084 int fix_screen;
1020 int old_width = szHint.width; 1085 int old_width = szHint.width;
1021 int old_height = szHint.height; 1086 int old_height = szHint.height;
1022 1087
1023 window_calc (newwidth, newheight); 1088 window_calc (newwidth, newheight);
1089
1090 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 1091 XSetWMNormalHints (dpy, parent[0], &szHint);
1025 1092
1026 if (!ignoreparent) 1093 if (!ignoreparent)
1027 { 1094 {
1028#ifdef SMART_RESIZE 1095#ifdef SMART_RESIZE
1029 /* 1096 /*
… …
1033 int x, y, x1, y1; 1100 int x, y, x1, y1;
1034 int dx, dy; 1101 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1102 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 1103 Window unused_cr;
1037 1104
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 1105 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 1106 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1107 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1108 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 1109 /*
1043 * if display->root isn't the parent window, a WM will probably have offset 1110 * if display->root isn't the parent window, a WM will probably have offset
1044 * our position for handles and decorations. Counter it 1111 * our position for handles and decorations. Counter it
1045 */ 1112 */
… …
1047 { 1114 {
1048 x -= x1; 1115 x -= x1;
1049 y -= y1; 1116 y -= y1;
1050 } 1117 }
1051 1118
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1119 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1120 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 1121 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 1122 dy = old_height - szHint.height;
1056 1123
1057 /* Check position of the center of the window */ 1124 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 1125 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 1129 if (y < y1) /* top half */
1063 dy = 0; 1130 dy = 0;
1064 else if (y == y1) /* exact center */ 1131 else if (y == y1) /* exact center */
1065 dy /= 2; 1132 dy /= 2;
1066 1133
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1134 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 1135 szHint.width, szHint.height);
1069#else 1136#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1137 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 1138#endif
1072 } 1139 }
1073 1140
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1141 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 1142
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 1143 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 1144 {
1078 if (scrollBar.state) 1145 if (scrollBar.state)
1079 { 1146 {
1080 XMoveResizeWindow (xdisp, scrollBar.win, 1147 XMoveResizeWindow (dpy, scrollBar.win,
1081 window_sb_x, 0, 1148 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height); 1149 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar (); 1150 resize_scrollbar ();
1084 } 1151 }
1085 1152
1086 XMoveResizeWindow (xdisp, vt, 1153 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 1154 window_vt_x, window_vt_y,
1088 width, height); 1155 width, height);
1089 1156
1157#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ())
1159 update_background ();
1160#endif
1161
1090 scr_clear (); 1162 scr_clear ();
1091#ifdef XPM_BACKGROUND
1092 resize_pixmap ();
1093#endif
1094 } 1163 }
1095 1164
1096 if (fix_screen || old_height == 0) 1165 if (fix_screen || old_height == 0)
1097 scr_reset (); 1166 scr_reset ();
1098 1167
1099#ifdef XPM_BACKGROUND 1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1100 if (pixmap) 1169 //scr_touch (false);
1170
1171#ifdef HAVE_BG_PIXMAP
1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173// if (bgPixmap.pixmap)
1101 scr_touch (false); 1174// scr_touch (false);
1102#endif 1175#endif
1103 1176
1104#ifdef USE_XIM 1177#ifdef USE_XIM
1105 IMSetStatusPosition (); 1178 IMSetPosition ();
1106#endif 1179#endif
1107} 1180}
1108 1181
1109/* 1182/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1183 * Set the width/height of the vt window in characters. Units are pixels.
… …
1115{ 1188{
1116 XWindowAttributes wattr; 1189 XWindowAttributes wattr;
1117 1190
1118 if (newwidth == 0 || newheight == 0) 1191 if (newwidth == 0 || newheight == 0)
1119 { 1192 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1193 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1194
1122 if (newwidth == 0) 1195 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1196 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1197 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1198 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1212#ifdef USE_XIM
1140 1213
1141void 1214void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1215rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1216{
1144 fg = pix_colors[Color_fg]; 1217 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1218 bg = pix_colors [Color_bg];
1146} 1219}
1147 1220
1148void 1221void
1149rxvt_term::im_set_size (XRectangle &size) 1222rxvt_term::im_set_size (XRectangle &size)
1150{ 1223{
… …
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1260 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1188 1261
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1262 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1190 *p = '\0'; 1263 *p = '\0';
1191 1264
1192 atom = XInternAtom (xdisp, server, False); 1265 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1266 win = XGetSelectionOwner (dpy, atom);
1194 1267
1195 if (win != None) 1268 if (win != None)
1196 return True; 1269 return True;
1197 } 1270 }
1198 1271
… …
1277 if (term->rs[Rs_imLocale]) 1350 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale); 1351 SET_LOCALE (term->locale);
1279 } 1352 }
1280 else 1353 else
1281 str = (void *)text->string.wide_char; 1354 str = (void *)text->string.wide_char;
1282 1355
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret, 1357 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first, 1358 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length, 1359 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1360 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1422 "*", 1495 "*",
1423 fheight, 1496 fheight,
1424 fheight + 1, fheight - 1, 1497 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1498 fheight - 2, fheight + 2);
1426 1499
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1500 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1501 &missing_charset_list, &missing_charset_count, &def_string);
1429 1502
1430 if (missing_charset_list) 1503 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1504 XFreeStringList (missing_charset_list);
1432 1505
… …
1507 preedit_attr, 1580 preedit_attr,
1508 status_attr ? XNStatusAttributes : NULL, 1581 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1582 status_attr, NULL);
1510 1583
1511 if (preedit_attr) XFree (preedit_attr); 1584 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1585 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1586 if (fs) XFreeFontSet (dpy, fs);
1514 1587
1515 if (Input_Context == NULL) 1588 if (Input_Context == NULL)
1516 { 1589 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1590 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1591 im_destroy ();
… …
1523 // unfortunately, only the focus window is used by XIM, hard to fix 1596 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1597 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input (); 1598 vt_select_input ();
1526#endif 1599#endif
1527 1600
1528 if (input_style & XIMPreeditArea)
1529 IMSetStatusPosition (); 1601 IMSetPosition ();
1530 1602
1531 return true; 1603 return true;
1532} 1604}
1533 1605
1534void 1606void
… …
1592 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1593#endif 1665#endif
1594} 1666}
1595 1667
1596void 1668void
1597rxvt_term::IMSetStatusPosition () 1669rxvt_term::IMSetPosition ()
1598{ 1670{
1599 XRectangle preedit_rect, status_rect, *needed_rect; 1671 XRectangle preedit_rect, status_rect, *needed_rect;
1600 XVaNestedList preedit_attr, status_attr; 1672 XVaNestedList preedit_attr, status_attr;
1601 1673
1602 if (!Input_Context 1674 if (!Input_Context
1603 || !focus 1675 || !focus
1604 || !(input_style & XIMPreeditArea) 1676 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1605 || !IMisRunning ()) 1677 || !IMisRunning ())
1606 return; 1678 return;
1607 1679
1680 if (input_style & XIMPreeditPosition)
1681 {
1682 im_set_size (preedit_rect);
1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1684
1685 XSetICValues (Input_Context,
1686 XNPreeditAttributes, preedit_attr, NULL);
1687 }
1688 else
1689 {
1608 /* Getting the necessary width of preedit area */ 1690 /* Getting the necessary width of preedit area */
1609 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1610 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1692 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1611 XFree (status_attr); 1693 XFree (status_attr);
1612 1694
1613 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1695 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1614 XFree (needed_rect); 1696 XFree (needed_rect);
1615 1697
1616 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1698 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1617 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1699 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1618 1700
1619 XSetICValues (Input_Context, 1701 XSetICValues (Input_Context,
1620 XNPreeditAttributes, preedit_attr, 1702 XNPreeditAttributes, preedit_attr,
1621 XNStatusAttributes, status_attr, NULL); 1703 XNStatusAttributes, status_attr,
1704 NULL);
1622 1705
1706 XFree (status_attr);
1707 }
1708
1623 XFree (preedit_attr); 1709 XFree (preedit_attr);
1624 XFree (status_attr);
1625} 1710}
1626#endif /* USE_XIM */ 1711#endif /* USE_XIM */
1712
1713void
1714rxvt_term::get_window_origin (int &x, int &y)
1715{
1716 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719}
1720
1721Pixmap
1722rxvt_term::get_pixmap_property (int prop_id)
1723{
1724 if (prop_id > 0 && prop_id < NUM_XA)
1725 if (xa[prop_id])
1726 {
1727 int aformat;
1728 unsigned long nitems, bytes_after;
1729 Atom atype;
1730 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop;
1737 }
1738 }
1739 return None;
1740}
1741
1742#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS
1744# undef update_background
1745int rxvt_term::trace_update_background (const char *file, int line)
1746{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background ();
1749}
1750# endif
1751
1752int
1753rxvt_term::update_background ()
1754{
1755 bgPixmap.invalidate ();
1756
1757 /* no chance of real time refresh if we are blurring! */
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1759 bgPixmap.render ();
1760 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering ())
1765 update_background_ev.start (.05);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773}
1774
1775void
1776rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{
1778 make_current ();
1779 bgPixmap.render ();
1780 refresh_check ();
1781}
1782
1783#endif /* HAVE_BG_PIXMAP */
1627 1784
1628/*----------------------- end-of-file (C source) -----------------------*/ 1785/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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