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.293 by ayin, Fri Dec 28 14:57:04 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 281#ifdef HAVE_BG_PIXMAP
261 delete pix_colors_focused; 282 bgPixmap.destroy ();
262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused;
264#endif 283#endif
265 284 display->flush (); /* ideally .put should do this */
266 displays.put (display); 285 displays.put (display);
267 286
268 scr_release (); 287 scr_release ();
269 288
270 /* clear all resources */ 289 /* clear all resources */
… …
283 delete argv; 302 delete argv;
284 303
285#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
286 delete keyboard; 305 delete keyboard;
287#endif 306#endif
307#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db);
309#endif
288} 310}
289 311
290// child has exited, usually destroys 312// child has exited, usually destroys
291void 313void
292rxvt_term::child_cb (child_watcher &w, int status) 314rxvt_term::child_cb (ev::child &w, int status)
293{ 315{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 316 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 317
296 cmd_pid = 0; 318 cmd_pid = 0;
297 319
298 if (!OPTION (Opt_hold)) 320 if (!option (Opt_hold))
299 destroy (); 321 destroy ();
300} 322}
301 323
302void 324void
303rxvt_term::destroy () 325rxvt_term::destroy ()
304{ 326{
305 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
306 return; 328 return;
307 329
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 331
310#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
… …
317 im_ev.stop (display); 339 im_ev.stop (display);
318#endif 340#endif
319#if HAVE_SCROLLBARS 341#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 342 scrollbar_ev.stop (display);
321#endif 343#endif
322#if TRANSPARENT 344#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 345 rootwin_ev.stop (display);
324#endif 346#endif
325 incr_ev.stop (); 347 incr_ev.stop ();
326 termwin_ev.stop (display); 348 termwin_ev.stop (display);
327 vt_ev.stop (display); 349 vt_ev.stop (display);
328 } 350 }
329 351
330 check_ev.stop (); 352 flush_ev.stop ();
331 pty_ev.stop (); 353 pty_ev.stop ();
332#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
334#endif 356#endif
335#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
343#endif 365#endif
344#ifdef POINTER_BLANK 366#ifdef POINTER_BLANK
345 pointer_ev.stop (); 367 pointer_ev.stop ();
346#endif 368#endif
347 369
348 destroy_ev.start (0); 370 destroy_ev.start ();
349} 371}
350 372
351void 373void
352rxvt_term::destroy_cb (time_watcher &w) 374rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 375{
354 make_current (); 376 make_current ();
355 377
356 delete this; 378 delete this;
357} 379}
… …
411 else 433 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 435 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 437 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 439 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 441}
420#endif 442#endif
421 443
… …
446 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
448} 470}
449 471
450/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
451bool 473void
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 475{
454 this->envv = envv; 476 this->envv = envv;
455 477
456 SET_R (this); 478 SET_R (this);
457 set_locale (""); 479 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
459 481
460 if (!init_vars ()) 482 init_vars ();
461 return false;
462 483
463 init_secondary (); 484 init_secondary ();
464 485
465 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
466 487
467#ifdef KEYSYM_RESOURCE 488#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 489 keyboard->register_done ();
469#endif 490#endif
470 491
471#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 493 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 494 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 495#endif
475 496
476 pty = ptytty::create (); 497 pty = ptytty::create ();
477 498
… …
480 init_xlocale (); 501 init_xlocale ();
481 502
482 scr_reset (); // initialize screen 503 scr_reset (); // initialize screen
483 504
484#if 0 505#if 0
485 XSynchronize (xdisp, True); 506 XSynchronize (dpy, True);
486#endif 507#endif
487 508
488#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 510 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
491#endif 512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
492#ifdef TRANSPARENT 517#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 518 if (option (Opt_transparent))
494 { 519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
498 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
499#endif 561#endif
500 562
501 set_colorfgbg (); 563 set_colorfgbg ();
502 564
503 init_command (cmd_argv); 565 init_command (cmd_argv);
504 566
505 free (cmd_argv); 567 free (cmd_argv);
506 568
507 if (pty->pty >= 0) 569 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
509
510 check_ev.start ();
511 571
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 573
514#if ENABLE_XEMBED 574#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 575 if (rs[Rs_embed])
516 { 576 {
517 long info[2] = { 0, XEMBED_MAPPED }; 577 long info[2] = { 0, XEMBED_MAPPED };
518 578
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 580 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 581 }
522#endif 582#endif
523 583
524 XMapWindow (xdisp, vt); 584 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 585 XMapWindow (dpy, parent[0]);
526
527 return true;
528} 586}
529 587
530static struct sig_handlers 588static struct sig_handlers
531{ 589{
532 sig_watcher sw_term, sw_int; 590 ev::sig sw_term, sw_int;
533 591
534 /* 592 /*
535 * Catch a fatal signal and tidy up before quitting 593 * Catch a fatal signal and tidy up before quitting
536 */ 594 */
537 void 595 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 596
597 sig_handlers ()
539 { 598 {
540 rxvt_emergency_cleanup (); 599 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) 600 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 601 }
550} sig_handlers; 602} sig_handlers;
551 603
604void
605sig_handlers::sig_term (ev::sig &w, int revents)
606{
607 rxvt_emergency_cleanup ();
608 w.stop ();
609 kill (getpid (), w.signum);
610}
611
552char **rxvt_environ; // startup environment 612char **rxvt_environ; // startup environment
553 613
554void 614void
555rxvt_init () 615rxvt_init ()
556{ 616{
557 ptytty::init (); 617 ptytty::init ();
618
619 if (!ev_default_loop (0))
620 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 621
559 rxvt_environ = environ; 622 rxvt_environ = environ;
560 623
561 signal (SIGHUP, SIG_IGN); 624 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 625 signal (SIGPIPE, SIG_IGN);
563 626
564 sig_handlers.sw_term.start (SIGTERM); 627 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 628 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566 629
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 631 /* signal (SIGURG, SIG_DFL); */
569 632
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
572 XSetIOErrorHandler (rxvt_xioerror_handler); 635 XSetIOErrorHandler (rxvt_xioerror_handler);
573 636
574 XrmInitialize (); 637 XrmInitialize ();
575} 638}
576 639
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/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
614/* 641/*
615 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
617 */ 644 */
618void 645void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 647{
… …
692 if (scrollBar.state) 719 if (scrollBar.state)
693 { 720 {
694 sb_w = scrollbar_TotalWidth (); 721 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 722 szHint.base_width += sb_w;
696 723
697 if (!OPTION (Opt_scrollBar_right)) 724 if (!option (Opt_scrollBar_right))
698 window_vt_x += sb_w; 725 window_vt_x += sb_w;
699 } 726 }
700 727
701 szHint.width_inc = fwidth; 728 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 729 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 730 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 731 szHint.min_height = szHint.base_height + szHint.height_inc;
705 732
706 if (newwidth && newwidth - szHint.base_width < max_width) 733 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 734 {
708 szHint.width = newwidth; 735 szHint.width = newwidth;
… …
723 { 750 {
724 min_it (height, max_height); 751 min_it (height, max_height);
725 szHint.height = szHint.base_height + height; 752 szHint.height = szHint.base_height + height;
726 } 753 }
727 754
728 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 755 if (scrollBar.state && option (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w; 756 window_sb_x = szHint.width - sb_w;
730 757
731 if (recalc_x) 758 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 760
734 if (recalc_y) 761 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 763
737 ncol = width / fwidth; 764 ncol = width / fwidth;
738 nrow = height / fheight; 765 nrow = height / fheight;
739} 766}
740 767
… …
756 ws.ws_xpixel = width; 783 ws.ws_xpixel = width;
757 ws.ws_ypixel = height; 784 ws.ws_ypixel = height;
758 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
759 786
760#if 0 787#if 0
761 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
762 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
763 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
764#endif 791#endif
765} 792}
766 793
… …
795 delete fontset[0]; 822 delete fontset[0];
796 fontset[0] = fs; 823 fontset[0] = fs;
797 824
798 prop = (*fs)[1]->properties (); 825 prop = (*fs)[1]->properties ();
799 prop.height += lineSpace; 826 prop.height += lineSpace;
827
800 fs->set_prop (prop); 828 fs->set_prop (prop, false);
801 829
802 fwidth = prop.width; 830 fwidth = prop.width;
803 fheight = prop.height; 831 fheight = prop.height;
804 fbase = prop.ascent; 832 fbase = prop.ascent;
805 833
… …
814 { 842 {
815 fontset[style] = fs = new rxvt_fontset (this); 843 fontset[style] = fs = new rxvt_fontset (this);
816 rxvt_fontprop prop2 = prop; 844 rxvt_fontprop prop2 = prop;
817 845
818 if (res) 846 if (res)
819 prop2.weight = prop2.slant = rxvt_fontprop::unset; 847 {
848 fs->populate (res);
849 fs->set_prop (prop2, false);
850 }
820 else 851 else
821 { 852 {
822 res = fontset[0]->fontdesc; 853 fs->populate (fontset[0]->fontdesc);
823 854
824 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 855 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; 856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
857
858 fs->set_prop (prop2, true);
826 } 859 }
827 860
828 fs->populate (res);
829 fs->set_prop (prop2);
830 } 861 }
831#else 862#else
832 fontset[style] = fontset[0]; 863 fontset[style] = fontset[0];
833#endif 864#endif
834 } 865 }
… …
836 if (parent[0]) 867 if (parent[0])
837 { 868 {
838 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
839 scr_remap_chars (); 870 scr_remap_chars ();
840 scr_touch (true); 871 scr_touch (true);
841 } 872 }
842 873
843 return true; 874 return true;
844} 875}
845 876
877void
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 878rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 879{
848 XChangeProperty (xdisp, parent[0], 880 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 881 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 882 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 883}
852 884
885void
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 886rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 887{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 888 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 889 char *s = rxvt_wcstoutf8 (ws);
857 890
858 XChangeProperty (xdisp, parent[0], 891 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 893 (const unsigned char *)s, strlen (s));
861 894
862 free (s); 895 free (s);
863 free (ws); 896 free (ws);
… …
882#if ENABLE_EWMH 915#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
884#endif 917#endif
885} 918}
886 919
920void
921rxvt_term::set_window_color (int idx, const char *color)
922{
887#ifdef XTERM_COLOR_CHANGE 923#ifdef XTERM_COLOR_CHANGE
888void
889rxvt_term::set_window_color (int idx, const char *color)
890{
891 rxvt_color xcol; 924 rxvt_color xcol;
892 int i; 925 int i;
893 926
894 if (color == NULL || *color == '\0') 927 if (color == NULL || *color == '\0')
895 return; 928 return;
896 929
897 color = strdup (color); 930 color = strdup (color);
898 allocated.push_back ((void *)color); 931 allocated.push_back ((void *)color);
… …
902 if (isdigit (*color)) 935 if (isdigit (*color))
903 { 936 {
904 i = atoi (color); 937 i = atoi (color);
905 938
906 if (i >= 8 && i <= 15) 939 if (i >= 8 && i <= 15)
940 {
907 { /* bright colors */ 941 /* bright colors */
908 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 942 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
910 goto done; 943 goto done;
911 } 944 }
912 945
913 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
947 {
914 { /* normal colors */ 948 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 949 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 goto done; 950 goto done;
917 } 951 }
918 } 952 }
919 953
… …
924 * so just keep gobbling up the colormap 958 * so just keep gobbling up the colormap
925 */ 959 */
926 960
927 pix_colors_focused[idx] = xcol; 961 pix_colors_focused[idx] = xcol;
928 962
929 /* XSetWindowAttributes attr; */
930 /* Cursor cursor; */
931done: 963done:
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. */ 964 /*TODO: handle Color_BD, scrollbar background, etc. */
943 965
966 update_fade_color (idx);
944 recolour_cursor (); 967 recolour_cursor ();
945 scr_recolour (); 968 scr_recolour ();
969#endif /* XTERM_COLOR_CHANGE */
946} 970}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 971
952void 972void
953rxvt_term::recolour_cursor () 973rxvt_term::recolour_cursor ()
954{ 974{
955 XColor xcol[2]; 975 XColor fg, bg;
956 976
957 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 977 (ISSET_PIXCOLOR (Color_pointer_fg)
958 ? pix_colors_focused[Color_pointer_fg] 978 ? pix_colors_focused[Color_pointer_fg]
959 : pix_colors_focused[Color_fg]; 979 : pix_colors_focused[Color_fg]).get (fg);
980
960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 981 (ISSET_PIXCOLOR (Color_pointer_bg)
961 ? pix_colors_focused[Color_pointer_bg] 982 ? pix_colors_focused[Color_pointer_bg]
962 : pix_colors_focused[Color_bg]; 983 : pix_colors_focused[Color_bg]).get (bg);
963 984
964 XQueryColors (xdisp, cmap, xcol, 2);
965 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 985 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 986}
967 987
968/*----------------------------------------------------------------------*/ 988/*----------------------------------------------------------------------*/
969/* 989/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 990 * find if fg/bg matches any of the normal (low-intensity) colors
971 */ 991 */
972void 992void
973rxvt_term::set_colorfgbg () 993rxvt_term::set_colorfgbg ()
974{ 994{
975 unsigned int i; 995 unsigned int i;
976 const char *xpmb = "\0"; 996 const char *xpmb = "";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 997 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
978 998
979 strcpy (fstr, "default"); 999 strcpy (fstr, "default");
980 strcpy (bstr, "default"); 1000 strcpy (bstr, "default");
981 for (i = Color_Black; i <= Color_White; i++) 1001 for (i = Color_Black; i <= Color_White; i++)
… …
987 1007
988 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1009 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1010 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1011 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1012#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1013 xpmb = "default;";
994#endif 1014#endif
995 break; 1015 break;
996 } 1016 }
997 1017
… …
1006 if (color.set (this, name)) 1026 if (color.set (this, name))
1007 return true; 1027 return true;
1008 1028
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1029 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 1030 return false;
1031}
1032
1033void
1034rxvt_term::alias_color (int dst, int src)
1035{
1036 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1011} 1037}
1012 1038
1013/* -------------------------------------------------------------------- * 1039/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 1040 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 1041 * -------------------------------------------------------------------- */
… …
1019 int fix_screen; 1045 int fix_screen;
1020 int old_width = szHint.width; 1046 int old_width = szHint.width;
1021 int old_height = szHint.height; 1047 int old_height = szHint.height;
1022 1048
1023 window_calc (newwidth, newheight); 1049 window_calc (newwidth, newheight);
1050
1051 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 1052 XSetWMNormalHints (dpy, parent[0], &szHint);
1025 1053
1026 if (!ignoreparent) 1054 if (!ignoreparent)
1027 { 1055 {
1028#ifdef SMART_RESIZE 1056#ifdef SMART_RESIZE
1029 /* 1057 /*
… …
1033 int x, y, x1, y1; 1061 int x, y, x1, y1;
1034 int dx, dy; 1062 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1063 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 1064 Window unused_cr;
1037 1065
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 1066 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 1067 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1068 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1069 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 1070 /*
1043 * if display->root isn't the parent window, a WM will probably have offset 1071 * if display->root isn't the parent window, a WM will probably have offset
1044 * our position for handles and decorations. Counter it 1072 * our position for handles and decorations. Counter it
1045 */ 1073 */
… …
1047 { 1075 {
1048 x -= x1; 1076 x -= x1;
1049 y -= y1; 1077 y -= y1;
1050 } 1078 }
1051 1079
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1080 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1081 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 1082 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 1083 dy = old_height - szHint.height;
1056 1084
1057 /* Check position of the center of the window */ 1085 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 1086 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 1090 if (y < y1) /* top half */
1063 dy = 0; 1091 dy = 0;
1064 else if (y == y1) /* exact center */ 1092 else if (y == y1) /* exact center */
1065 dy /= 2; 1093 dy /= 2;
1066 1094
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1095 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 1096 szHint.width, szHint.height);
1069#else 1097#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1098 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 1099#endif
1072 } 1100 }
1073 1101
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1102 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 1103
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 1104 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 1105 {
1078 if (scrollBar.state) 1106 if (scrollBar.state)
1079 { 1107 {
1080 XMoveResizeWindow (xdisp, scrollBar.win, 1108 XMoveResizeWindow (dpy, scrollBar.win,
1081 window_sb_x, 0, 1109 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height); 1110 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar (); 1111 resize_scrollbar ();
1084 } 1112 }
1085 1113
1086 XMoveResizeWindow (xdisp, vt, 1114 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 1115 window_vt_x, window_vt_y,
1088 width, height); 1116 width, height);
1089 1117
1118#ifdef HAVE_BG_PIXMAP
1119 if (bgPixmap.window_size_sensitive ())
1120 update_background ();
1121#endif
1122
1090 scr_clear (); 1123 scr_clear ();
1091#ifdef XPM_BACKGROUND
1092 resize_pixmap ();
1093#endif
1094 } 1124 }
1095 1125
1096 if (fix_screen || old_height == 0) 1126 if (fix_screen || old_height == 0)
1097 scr_reset (); 1127 scr_reset ();
1098 1128
1099#ifdef XPM_BACKGROUND 1129 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1100 if (pixmap) 1130 //scr_touch (false);
1131
1132#ifdef HAVE_BG_PIXMAP
1133// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1134// if (bgPixmap.pixmap)
1101 scr_touch (false); 1135// scr_touch (false);
1102#endif 1136#endif
1103 1137
1104#ifdef USE_XIM 1138#ifdef USE_XIM
1105 IMSetStatusPosition (); 1139 IMSetPosition ();
1106#endif 1140#endif
1107} 1141}
1108 1142
1109/* 1143/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1144 * Set the width/height of the vt window in characters. Units are pixels.
… …
1115{ 1149{
1116 XWindowAttributes wattr; 1150 XWindowAttributes wattr;
1117 1151
1118 if (newwidth == 0 || newheight == 0) 1152 if (newwidth == 0 || newheight == 0)
1119 { 1153 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1154 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1155
1122 if (newwidth == 0) 1156 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1157 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1158 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1159 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1173#ifdef USE_XIM
1140 1174
1141void 1175void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1176rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1177{
1144 fg = pix_colors[Color_fg]; 1178 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1179 bg = pix_colors [Color_bg];
1146} 1180}
1147 1181
1148void 1182void
1149rxvt_term::im_set_size (XRectangle &size) 1183rxvt_term::im_set_size (XRectangle &size)
1150{ 1184{
… …
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1221 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1188 1222
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1223 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1190 *p = '\0'; 1224 *p = '\0';
1191 1225
1192 atom = XInternAtom (xdisp, server, False); 1226 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1227 win = XGetSelectionOwner (dpy, atom);
1194 1228
1195 if (win != None) 1229 if (win != None)
1196 return True; 1230 return True;
1197 } 1231 }
1198 1232
… …
1277 if (term->rs[Rs_imLocale]) 1311 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale); 1312 SET_LOCALE (term->locale);
1279 } 1313 }
1280 else 1314 else
1281 str = (void *)text->string.wide_char; 1315 str = (void *)text->string.wide_char;
1282 1316
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1317 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret, 1318 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first, 1319 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length, 1320 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1321 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1422 "*", 1456 "*",
1423 fheight, 1457 fheight,
1424 fheight + 1, fheight - 1, 1458 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1459 fheight - 2, fheight + 2);
1426 1460
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1461 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1462 &missing_charset_list, &missing_charset_count, &def_string);
1429 1463
1430 if (missing_charset_list) 1464 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1465 XFreeStringList (missing_charset_list);
1432 1466
… …
1507 preedit_attr, 1541 preedit_attr,
1508 status_attr ? XNStatusAttributes : NULL, 1542 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1543 status_attr, NULL);
1510 1544
1511 if (preedit_attr) XFree (preedit_attr); 1545 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1546 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1547 if (fs) XFreeFontSet (dpy, fs);
1514 1548
1515 if (Input_Context == NULL) 1549 if (Input_Context == NULL)
1516 { 1550 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1551 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1552 im_destroy ();
… …
1523 // unfortunately, only the focus window is used by XIM, hard to fix 1557 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1558 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input (); 1559 vt_select_input ();
1526#endif 1560#endif
1527 1561
1528 if (input_style & XIMPreeditArea)
1529 IMSetStatusPosition (); 1562 IMSetPosition ();
1530 1563
1531 return true; 1564 return true;
1532} 1565}
1533 1566
1534void 1567void
… …
1592 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1593#endif 1626#endif
1594} 1627}
1595 1628
1596void 1629void
1597rxvt_term::IMSetStatusPosition () 1630rxvt_term::IMSetPosition ()
1598{ 1631{
1599 XRectangle preedit_rect, status_rect, *needed_rect; 1632 XRectangle preedit_rect, status_rect, *needed_rect;
1600 XVaNestedList preedit_attr, status_attr; 1633 XVaNestedList preedit_attr, status_attr;
1601 1634
1602 if (!Input_Context 1635 if (!Input_Context
1603 || !focus 1636 || !focus
1604 || !(input_style & XIMPreeditArea) 1637 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1605 || !IMisRunning ()) 1638 || !IMisRunning ())
1606 return; 1639 return;
1607 1640
1641 if (input_style & XIMPreeditPosition)
1642 {
1643 im_set_size (preedit_rect);
1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1645
1646 XSetICValues (Input_Context,
1647 XNPreeditAttributes, preedit_attr, NULL);
1648 }
1649 else
1650 {
1608 /* Getting the necessary width of preedit area */ 1651 /* Getting the necessary width of preedit area */
1609 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1652 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1610 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1653 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1611 XFree (status_attr); 1654 XFree (status_attr);
1612 1655
1613 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1656 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1614 XFree (needed_rect); 1657 XFree (needed_rect);
1615 1658
1616 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1659 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1617 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1660 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1618 1661
1619 XSetICValues (Input_Context, 1662 XSetICValues (Input_Context,
1620 XNPreeditAttributes, preedit_attr, 1663 XNPreeditAttributes, preedit_attr,
1621 XNStatusAttributes, status_attr, NULL); 1664 XNStatusAttributes, status_attr,
1665 NULL);
1622 1666
1667 XFree (status_attr);
1668 }
1669
1623 XFree (preedit_attr); 1670 XFree (preedit_attr);
1624 XFree (status_attr);
1625} 1671}
1626#endif /* USE_XIM */ 1672#endif /* USE_XIM */
1673
1674void
1675rxvt_term::get_window_origin (int &x, int &y)
1676{
1677 Window cr;
1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1680}
1681
1682Pixmap
1683rxvt_term::get_pixmap_property (int prop_id)
1684{
1685 if (prop_id > 0 && prop_id < NUM_XA)
1686 if (xa[prop_id])
1687 {
1688 int aformat;
1689 unsigned long nitems, bytes_after;
1690 Atom atype;
1691 unsigned char *prop = NULL;
1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1694 &nitems, &bytes_after, &prop);
1695 if (result == Success && prop && atype == XA_PIXMAP)
1696 return *(Pixmap *)prop;
1697 }
1698
1699 return None;
1700}
1701
1702#ifdef HAVE_BG_PIXMAP
1703# if TRACE_PIXMAPS
1704# undef update_background
1705void
1706rxvt_term::trace_update_background (const char *file, int line)
1707{
1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1709 update_background ();
1710}
1711# endif
1712
1713void
1714rxvt_term::update_background ()
1715{
1716 bgPixmap.invalidate ();
1717
1718 /* no chance of real time refresh if we are blurring! */
1719 if (bgPixmap.invalid_since + 0.50 < ev::now ()
1720 && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1721 {
1722 update_background_ev.stop ();
1723 bgPixmap.render ();
1724 }
1725 else
1726 {
1727 ev_tstamp refresh;
1728
1729 if (!bgPixmap.need_client_side_rendering ())
1730 refresh = .05;
1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732 refresh = .20; /* very slow !!! */
1733 else
1734 refresh = .07;
1735
1736 update_background_ev.start (refresh);
1737 }
1738}
1739
1740void
1741rxvt_term::update_background_cb (ev::timer &w, int revents)
1742{
1743 make_current ();
1744 bgPixmap.render ();
1745 refresh_check ();
1746}
1747
1748#endif /* HAVE_BG_PIXMAP */
1627 1749
1628/*----------------------- end-of-file (C source) -----------------------*/ 1750/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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