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.289 by ayin, Tue Dec 18 11:15:24 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);
… …
572 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
573 639
574 XrmInitialize (); 640 XrmInitialize ();
575} 641}
576 642
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/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
614/* 644/*
615 * window size/position calculcations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
617 */ 647 */
618void 648void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 650{
… …
691 721
692 if (scrollBar.state) 722 if (scrollBar.state)
693 { 723 {
694 sb_w = scrollbar_TotalWidth (); 724 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 725 szHint.base_width += sb_w;
726
696 if (!OPTION (Opt_scrollBar_right)) 727 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 728 window_vt_x += sb_w;
698 } 729 }
699 730
700 szHint.width_inc = fwidth; 731 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 732 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 733 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 734 szHint.min_height = szHint.base_height + szHint.height_inc;
704 735
705 if (newwidth && newwidth - szHint.base_width < max_width) 736 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 737 {
707 szHint.width = newwidth; 738 szHint.width = newwidth;
… …
722 { 753 {
723 min_it (height, max_height); 754 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
725 } 756 }
726 757
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 758 if (scrollBar.state && option (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 759 window_sb_x = szHint.width - sb_w;
729 760
730 if (recalc_x) 761 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 763
733 if (recalc_y) 764 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 765 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 766
736 ncol = width / fwidth; 767 ncol = width / fwidth;
737 nrow = height / fheight; 768 nrow = height / fheight;
738} 769}
739 770
… …
755 ws.ws_xpixel = width; 786 ws.ws_xpixel = width;
756 ws.ws_ypixel = height; 787 ws.ws_ypixel = height;
757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
758 789
759#if 0 790#if 0
760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 791 // TIOCSWINSZ is supposed to do this automatically and correctly
761 if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
762 kill (-cmd_pid, SIGWINCH); 793 kill (-cmd_pid, SIGWINCH);
763#endif 794#endif
764} 795}
765 796
… …
794 delete fontset[0]; 825 delete fontset[0];
795 fontset[0] = fs; 826 fontset[0] = fs;
796 827
797 prop = (*fs)[1]->properties (); 828 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 829 prop.height += lineSpace;
830
799 fs->set_prop (prop); 831 fs->set_prop (prop, false);
800 832
801 fwidth = prop.width; 833 fwidth = prop.width;
802 fheight = prop.height; 834 fheight = prop.height;
803 fbase = prop.ascent; 835 fbase = prop.ascent;
804 836
… …
813 { 845 {
814 fontset[style] = fs = new rxvt_fontset (this); 846 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 847 rxvt_fontprop prop2 = prop;
816 848
817 if (res) 849 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 850 {
851 fs->populate (res);
852 fs->set_prop (prop2, false);
853 }
819 else 854 else
820 { 855 {
821 res = fontset[0]->fontdesc; 856 fs->populate (fontset[0]->fontdesc);
822 857
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 858 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; 859 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
860
861 fs->set_prop (prop2, true);
825 } 862 }
826 863
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 864 }
830#else 865#else
831 fontset[style] = fontset[0]; 866 fontset[style] = fontset[0];
832#endif 867#endif
833 } 868 }
… …
835 if (parent[0]) 870 if (parent[0])
836 { 871 {
837 resize_all_windows (0, 0, 0); 872 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 873 scr_remap_chars ();
839 scr_touch (true); 874 scr_touch (true);
840 } 875 }
841 876
842 return true; 877 return true;
843} 878}
844 879
880void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 881rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 882{
847 XChangeProperty (xdisp, parent[0], 883 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 884 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 885 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 886}
851 887
888void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 889rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 890{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 891 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 892 char *s = rxvt_wcstoutf8 (ws);
856 893
857 XChangeProperty (xdisp, parent[0], 894 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 895 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 896 (const unsigned char *)s, strlen (s));
860 897
861 free (s); 898 free (s);
862 free (ws); 899 free (ws);
… …
881#if ENABLE_EWMH 918#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 919 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 920#endif
884} 921}
885 922
923void
924rxvt_term::set_window_color (int idx, const char *color)
925{
886#ifdef XTERM_COLOR_CHANGE 926#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 927 rxvt_color xcol;
891 int i; 928 int i;
892 929
893 if (color == NULL || *color == '\0') 930 if (color == NULL || *color == '\0')
894 return; 931 return;
895 932
933 color = strdup (color);
934 allocated.push_back ((void *)color);
935 rs[Rs_color + idx] = color;
936
896 /* handle color aliases */ 937 /* handle color aliases */
897 if (isdigit (*color)) 938 if (isdigit (*color))
898 { 939 {
899 i = atoi (color); 940 i = atoi (color);
900 941
901 if (i >= 8 && i <= 15) 942 if (i >= 8 && i <= 15)
943 {
902 { /* bright colors */ 944 /* bright colors */
903 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
905 SET_PIXCOLOR (idx);
906 goto done; 946 goto done;
907 } 947 }
908 948
909 if (i >= 0 && i <= 7) 949 if (i >= 0 && i <= 7)
950 {
910 { /* normal colors */ 951 /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 953 goto done;
914 } 954 }
915 } 955 }
916 956
917 if (!set_color (xcol, color)) 957 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 958
922 /* 959 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 960 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
925 */ 962 */
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 963
938 pix_colors_focused[idx] = xcol; 964 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 965
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 966done:
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. */ 967 /*TODO: handle Color_BD, scrollbar background, etc. */
955 968
969 update_fade_color (idx);
956 recolour_cursor (); 970 recolour_cursor ();
957 scr_recolour (); 971 scr_recolour ();
972#endif /* XTERM_COLOR_CHANGE */
958} 973}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 974
964void 975void
965rxvt_term::recolour_cursor () 976rxvt_term::recolour_cursor ()
966{ 977{
967 XColor xcol[2]; 978 XColor fg, bg;
968 979
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 980 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 981 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 982 : pix_colors_focused[Color_fg]).get (fg);
983
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 984 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 985 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 986 : pix_colors_focused[Color_bg]).get (bg);
975 987
976 XQueryColors (xdisp, cmap, xcol, 2);
977 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 988 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978} 989}
979 990
980/*----------------------------------------------------------------------*/ 991/*----------------------------------------------------------------------*/
981/* 992/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 993 * find if fg/bg matches any of the normal (low-intensity) colors
983 */ 994 */
984void 995void
985rxvt_term::set_colorfgbg () 996rxvt_term::set_colorfgbg ()
986{ 997{
987 unsigned int i; 998 unsigned int i;
988 const char *xpmb = "\0"; 999 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1000 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 1001
991 strcpy (fstr, "default"); 1002 strcpy (fstr, "default");
992 strcpy (bstr, "default"); 1003 strcpy (bstr, "default");
993 for (i = Color_Black; i <= Color_White; i++) 1004 for (i = Color_Black; i <= Color_White; i++)
… …
999 1010
1000 for (i = Color_Black; i <= Color_White; i++) 1011 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1012 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1013 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1014 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1015#ifdef BG_IMAGE_FROM_FILE
1005 xpmb = "default;"; 1016 xpmb = "default;";
1006#endif 1017#endif
1007 break; 1018 break;
1008 } 1019 }
1009 1020
… …
1018 if (color.set (this, name)) 1029 if (color.set (this, name))
1019 return true; 1030 return true;
1020 1031
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1032 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false; 1033 return false;
1034}
1035
1036void
1037rxvt_term::alias_color (int dst, int src)
1038{
1039 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1040}
1024 1041
1025/* -------------------------------------------------------------------- * 1042/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1043 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1044 * -------------------------------------------------------------------- */
… …
1031 int fix_screen; 1048 int fix_screen;
1032 int old_width = szHint.width; 1049 int old_width = szHint.width;
1033 int old_height = szHint.height; 1050 int old_height = szHint.height;
1034 1051
1035 window_calc (newwidth, newheight); 1052 window_calc (newwidth, newheight);
1053
1054 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1036 XSetWMNormalHints (xdisp, parent[0], &szHint); 1055 XSetWMNormalHints (dpy, parent[0], &szHint);
1037 1056
1038 if (!ignoreparent) 1057 if (!ignoreparent)
1039 { 1058 {
1040#ifdef SMART_RESIZE 1059#ifdef SMART_RESIZE
1041 /* 1060 /*
… …
1045 int x, y, x1, y1; 1064 int x, y, x1, y1;
1046 int dx, dy; 1065 int dx, dy;
1047 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1048 Window unused_cr; 1067 Window unused_cr;
1049 1068
1050 XTranslateCoordinates (xdisp, parent[0], display->root, 1069 XTranslateCoordinates (dpy, parent[0], display->root,
1051 0, 0, &x, &y, &unused_cr); 1070 0, 0, &x, &y, &unused_cr);
1052 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1071 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1053 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1054 /* 1073 /*
1055 * if display->root isn't the parent window, a WM will probably have offset 1074 * if display->root isn't the parent window, a WM will probably have offset
1056 * our position for handles and decorations. Counter it 1075 * our position for handles and decorations. Counter it
1057 */ 1076 */
… …
1059 { 1078 {
1060 x -= x1; 1079 x -= x1;
1061 y -= y1; 1080 y -= y1;
1062 } 1081 }
1063 1082
1064 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1083 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1065 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1084 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1066 dx = old_width - szHint.width; 1085 dx = old_width - szHint.width;
1067 dy = old_height - szHint.height; 1086 dy = old_height - szHint.height;
1068 1087
1069 /* Check position of the center of the window */ 1088 /* Check position of the center of the window */
1070 if (x < x1) /* left half */ 1089 if (x < x1) /* left half */
… …
1074 if (y < y1) /* top half */ 1093 if (y < y1) /* top half */
1075 dy = 0; 1094 dy = 0;
1076 else if (y == y1) /* exact center */ 1095 else if (y == y1) /* exact center */
1077 dy /= 2; 1096 dy /= 2;
1078 1097
1079 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1098 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1080 szHint.width, szHint.height); 1099 szHint.width, szHint.height);
1081#else 1100#else
1082 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1101 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1083#endif 1102#endif
1084 } 1103 }
1085 1104
1086 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1087 1106
1088 if (fix_screen || newwidth != old_width || newheight != old_height) 1107 if (fix_screen || newwidth != old_width || newheight != old_height)
1089 { 1108 {
1090 if (scrollBar.state) 1109 if (scrollBar.state)
1091 { 1110 {
1092 XMoveResizeWindow (xdisp, scrollBar.win, 1111 XMoveResizeWindow (dpy, scrollBar.win,
1093 window_sb_x, 0, 1112 window_sb_x, 0,
1094 scrollbar_TotalWidth (), szHint.height); 1113 scrollbar_TotalWidth (), szHint.height);
1095 resize_scrollbar (); 1114 resize_scrollbar ();
1096 } 1115 }
1097 1116
1098 XMoveResizeWindow (xdisp, vt, 1117 XMoveResizeWindow (dpy, vt,
1099 window_vt_x, window_vt_y, 1118 window_vt_x, window_vt_y,
1100 width, height); 1119 width, height);
1101 1120
1121#ifdef HAVE_BG_PIXMAP
1122 if (bgPixmap.window_size_sensitive ())
1123 update_background ();
1124#endif
1125
1102 scr_clear (); 1126 scr_clear ();
1103#ifdef XPM_BACKGROUND
1104 resize_pixmap ();
1105#endif
1106 } 1127 }
1107 1128
1108 if (fix_screen || old_height == 0) 1129 if (fix_screen || old_height == 0)
1109 scr_reset (); 1130 scr_reset ();
1110 1131
1111#ifdef XPM_BACKGROUND 1132 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1112 if (pixmap) 1133 //scr_touch (false);
1134
1135#ifdef HAVE_BG_PIXMAP
1136// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137// if (bgPixmap.pixmap)
1113 scr_touch (false); 1138// scr_touch (false);
1114#endif 1139#endif
1115 1140
1116#ifdef USE_XIM 1141#ifdef USE_XIM
1117 IMSetStatusPosition (); 1142 IMSetPosition ();
1118#endif 1143#endif
1119} 1144}
1120 1145
1121/* 1146/*
1122 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1127{ 1152{
1128 XWindowAttributes wattr; 1153 XWindowAttributes wattr;
1129 1154
1130 if (newwidth == 0 || newheight == 0) 1155 if (newwidth == 0 || newheight == 0)
1131 { 1156 {
1132 XGetWindowAttributes (xdisp, display->root, &wattr); 1157 XGetWindowAttributes (dpy, display->root, &wattr);
1133 1158
1134 if (newwidth == 0) 1159 if (newwidth == 0)
1135 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1136 if (newheight == 0) 1161 if (newheight == 0)
1137 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
… …
1151#ifdef USE_XIM 1176#ifdef USE_XIM
1152 1177
1153void 1178void
1154rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1155{ 1180{
1156 fg = pix_colors[Color_fg]; 1181 fg = pix_colors [Color_fg];
1157 bg = pix_colors[Color_bg]; 1182 bg = pix_colors [Color_bg];
1158} 1183}
1159 1184
1160void 1185void
1161rxvt_term::im_set_size (XRectangle &size) 1186rxvt_term::im_set_size (XRectangle &size)
1162{ 1187{
… …
1199 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1224 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1200 1225
1201 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1226 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1202 *p = '\0'; 1227 *p = '\0';
1203 1228
1204 atom = XInternAtom (xdisp, server, False); 1229 atom = XInternAtom (dpy, server, False);
1205 win = XGetSelectionOwner (xdisp, atom); 1230 win = XGetSelectionOwner (dpy, atom);
1206 1231
1207 if (win != None) 1232 if (win != None)
1208 return True; 1233 return True;
1209 } 1234 }
1210 1235
… …
1289 if (term->rs[Rs_imLocale]) 1314 if (term->rs[Rs_imLocale])
1290 SET_LOCALE (term->locale); 1315 SET_LOCALE (term->locale);
1291 } 1316 }
1292 else 1317 else
1293 str = (void *)text->string.wide_char; 1318 str = (void *)text->string.wide_char;
1294 1319
1295 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1320 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1296 DT_INT, call_data->caret, 1321 DT_INT, call_data->caret,
1297 DT_INT, call_data->chg_first, 1322 DT_INT, call_data->chg_first,
1298 DT_INT, call_data->chg_length, 1323 DT_INT, call_data->chg_length,
1299 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1324 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1434 "*", 1459 "*",
1435 fheight, 1460 fheight,
1436 fheight + 1, fheight - 1, 1461 fheight + 1, fheight - 1,
1437 fheight - 2, fheight + 2); 1462 fheight - 2, fheight + 2);
1438 1463
1439 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1464 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1440 &missing_charset_list, &missing_charset_count, &def_string); 1465 &missing_charset_list, &missing_charset_count, &def_string);
1441 1466
1442 if (missing_charset_list) 1467 if (missing_charset_list)
1443 XFreeStringList (missing_charset_list); 1468 XFreeStringList (missing_charset_list);
1444 1469
… …
1519 preedit_attr, 1544 preedit_attr,
1520 status_attr ? XNStatusAttributes : NULL, 1545 status_attr ? XNStatusAttributes : NULL,
1521 status_attr, NULL); 1546 status_attr, NULL);
1522 1547
1523 if (preedit_attr) XFree (preedit_attr); 1548 if (preedit_attr) XFree (preedit_attr);
1524 if (status_attr) XFree (status_attr); 1549 if (status_attr) XFree (status_attr);
1525 if (fs) XFreeFontSet (xdisp, fs); 1550 if (fs) XFreeFontSet (dpy, fs);
1526 1551
1527 if (Input_Context == NULL) 1552 if (Input_Context == NULL)
1528 { 1553 {
1529 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1554 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1530 im_destroy (); 1555 im_destroy ();
… …
1535 // unfortunately, only the focus window is used by XIM, hard to fix 1560 // unfortunately, only the focus window is used by XIM, hard to fix
1536 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1537 vt_select_input (); 1562 vt_select_input ();
1538#endif 1563#endif
1539 1564
1540 if (input_style & XIMPreeditArea)
1541 IMSetStatusPosition (); 1565 IMSetPosition ();
1542 1566
1543 return true; 1567 return true;
1544} 1568}
1545 1569
1546void 1570void
… …
1604 SET_LOCALE (locale); 1628 SET_LOCALE (locale);
1605#endif 1629#endif
1606} 1630}
1607 1631
1608void 1632void
1609rxvt_term::IMSetStatusPosition () 1633rxvt_term::IMSetPosition ()
1610{ 1634{
1611 XRectangle preedit_rect, status_rect, *needed_rect; 1635 XRectangle preedit_rect, status_rect, *needed_rect;
1612 XVaNestedList preedit_attr, status_attr; 1636 XVaNestedList preedit_attr, status_attr;
1613 1637
1614 if (!Input_Context 1638 if (!Input_Context
1615 || !focus 1639 || !focus
1616 || !(input_style & XIMPreeditArea) 1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1617 || !IMisRunning ()) 1641 || !IMisRunning ())
1618 return; 1642 return;
1619 1643
1644 if (input_style & XIMPreeditPosition)
1645 {
1646 im_set_size (preedit_rect);
1647 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1648
1649 XSetICValues (Input_Context,
1650 XNPreeditAttributes, preedit_attr, NULL);
1651 }
1652 else
1653 {
1620 /* Getting the necessary width of preedit area */ 1654 /* Getting the necessary width of preedit area */
1621 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1655 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1622 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1656 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1623 XFree (status_attr); 1657 XFree (status_attr);
1624 1658
1625 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1659 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1626 XFree (needed_rect); 1660 XFree (needed_rect);
1627 1661
1628 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1662 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1629 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1663 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1630 1664
1631 XSetICValues (Input_Context, 1665 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, 1666 XNPreeditAttributes, preedit_attr,
1633 XNStatusAttributes, status_attr, NULL); 1667 XNStatusAttributes, status_attr,
1668 NULL);
1634 1669
1670 XFree (status_attr);
1671 }
1672
1635 XFree (preedit_attr); 1673 XFree (preedit_attr);
1636 XFree (status_attr);
1637} 1674}
1638#endif /* USE_XIM */ 1675#endif /* USE_XIM */
1676
1677void
1678rxvt_term::get_window_origin (int &x, int &y)
1679{
1680 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683}
1684
1685Pixmap
1686rxvt_term::get_pixmap_property (int prop_id)
1687{
1688 if (prop_id > 0 && prop_id < NUM_XA)
1689 if (xa[prop_id])
1690 {
1691 int aformat;
1692 unsigned long nitems, bytes_after;
1693 Atom atype;
1694 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP)
1699 {
1700 return *(Pixmap *)prop;
1701 }
1702 }
1703 return None;
1704}
1705
1706#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709int rxvt_term::trace_update_background (const char *file, int line)
1710{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background ();
1713}
1714# endif
1715
1716int
1717rxvt_term::update_background ()
1718{
1719 bgPixmap.invalidate ();
1720
1721 /* no chance of real time refresh if we are blurring! */
1722 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1723 bgPixmap.render ();
1724 else
1725 {
1726 ev_tstamp refresh;
1727 update_background_ev.stop ();
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 update_background_ev.start (refresh);
1736 }
1737
1738 return 0;
1739}
1740
1741void
1742rxvt_term::update_background_cb (ev::timer &w, int revents)
1743{
1744 make_current ();
1745 bgPixmap.render ();
1746 refresh_check ();
1747}
1748
1749#endif /* HAVE_BG_PIXMAP */
1639 1750
1640/*----------------------- end-of-file (C source) -----------------------*/ 1751/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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