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.186 by root, Tue Jan 17 15:41:33 2006 UTC vs.
Revision 1.318 by root, Sat May 30 08:51:23 2009 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-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
49#endif 51# endif
50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif 52#endif
53
54vector<rxvt_term *> rxvt_term::termlist;
55
56// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term;
58
59static char curlocale[128], savelocale[128];
55 60
56bool 61bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 62rxvt_set_locale (const char *locale) NOTHROW
72{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
73 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 70 return false;
75 71
76 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
78 return true; 74 return true;
79} 75}
80 76
81void 77void
82rxvt_push_locale (const char *locale) 78rxvt_push_locale (const char *locale) NOTHROW
83{ 79{
84 strcpy (savelocale, curlocale); 80 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 81 rxvt_set_locale (locale);
86} 82}
87 83
88void 84void
89rxvt_pop_locale () 85rxvt_pop_locale () NOTHROW
90{ 86{
91 rxvt_set_locale (savelocale); 87 rxvt_set_locale (savelocale);
92} 88}
93 89
94#if ENABLE_COMBINING 90#if ENABLE_COMBINING
95class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
96 92
97text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
98{ 94{
99 compose_char *cc; 95 compose_char *cc;
100 96
101 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
102 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
103 cc = (*this)[c1]; 99 cc = (*this)[c1];
104 while (cc) 100 while (cc)
105 { 101 {
… …
154 150
155} 151}
156#endif 152#endif
157 153
158rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
159 : 155{
160#if TRANSPARENT 156#if HAVE_BG_PIXMAP
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
162#endif
163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 158#endif
166#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
168#endif 161#endif
169#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
170 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
171#endif 164#endif
172#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
173 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
174#endif 167#endif
175#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
176 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
177#endif 170#endif
178#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
179 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 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),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 180#endif
181#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
182 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 183#endif
184#ifdef USE_XIM 184#ifndef NO_BELL
185 im_ev (this, &rxvt_term::im_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
186#endif 186#endif
187 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194{ 194
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 201#endif
205} 202}
206 203
207// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 205// for use before an emergency exit
206void
209void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
210{ 208{
211 if (cmd_pid) 209 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
213 211
212 pty_ev.stop ();
214 delete pty; pty = 0; 213 delete pty; pty = 0;
215} 214}
216 215
217rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
218{ 217{
219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
221 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
222 219
223 emergency_cleanup (); 220 emergency_cleanup ();
224 221
225#if ENABLE_STYLES 222#if ENABLE_STYLES
… …
227 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
228 delete fontset[i]; 225 delete fontset[i];
229#endif 226#endif
230 delete fontset[0]; 227 delete fontset[0];
231 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
232 if (display) 239 if (display)
233 { 240 {
234 dDisp;
235
236 selection_clear (); 241 selection_clear ();
237 242
238#ifdef USE_XIM 243#ifdef USE_XIM
239 im_destroy (); 244 im_destroy ();
240#endif 245#endif
241#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
243 if (ShadowGC) XFreeGC (disp, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (disp, blackGC);
250 if (whiteGC) XFreeGC (disp, whiteGC);
251 if (grayGC) XFreeGC (disp, grayGC);
252 if (darkGC) XFreeGC (disp, darkGC);
253 if (stippleGC) XFreeGC (disp, stippleGC);
254 if (dimple) XFreePixmap (disp, dimple);
255 if (upArrow) XFreePixmap (disp, upArrow);
256 if (downArrow) XFreePixmap (disp, downArrow);
257 if (upArrowHi) XFreePixmap (disp, upArrowHi);
258 if (downArrowHi) XFreePixmap (disp, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (disp, topShadowGC);
262 if (botShadowGC) XFreeGC (disp, botShadowGC);
263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
264#endif
265 if (gc) XFreeGC (disp, gc); 247 if (gc) XFreeGC (dpy, gc);
266 248
267 delete drawable; 249 delete drawable;
268 // destroy all windows 250 // destroy all windows
269 if (parent[0]) 251 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 252 XDestroyWindow (dpy, parent[0]);
271 }
272 253
273 // TODO: free pixcolours, colours should become part of rxvt_display 254 for (int i = 0; i < TOTAL_COLORS; i++)
274 delete pix_colors_focused; 255 if (ISSET_PIXCOLOR (i))
256 {
257 pix_colors_focused [i].free (this);
275#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
276 delete pix_colors_unfocused; 259 pix_colors_unfocused [i].free (this);
277#endif 260#endif
261 }
278 262
263 clear ();
264
265 display->flush (); /* ideally .put should do this */
279 displays.put (display); 266 displays.put (display);
267 }
280 268
281 scr_release (); 269 scr_release ();
282 270
283 /* clear all resources */ 271 /* clear all resources */
284 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
285 free (allocated [i]); 273 free (allocated [i]);
286 274
287 free (selection.text); 275 free (selection.text);
288 // TODO: manage env vars in child only(!) 276 // TODO: manage env vars in child only(!)
289 free (env_windowid);
290 free (env_display); 277 free (env_display);
291 free (env_term); 278 free (env_term);
292 free (env_colorfgbg);
293 free (locale); 279 free (locale);
294 free (v_buffer); 280 free (v_buffer);
295 free (incr_buf); 281 free (incr_buf);
296 282
297 delete envv; 283 delete envv;
298 delete argv; 284 delete argv;
299 285
300#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
301 delete keyboard; 287 delete keyboard;
302#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
303} 292}
304 293
294// child has exited, usually destroys
305void 295void
306rxvt_term::child_exit () 296rxvt_term::child_cb (ev::child &w, int status)
307{ 297{
298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
299
308 cmd_pid = 0; 300 cmd_pid = 0;
309 301
310 if (!OPTION (Opt_hold)) 302 if (!option (Opt_hold))
311 destroy (); 303 destroy ();
312} 304}
313 305
314void 306void
315rxvt_term::destroy () 307rxvt_term::destroy ()
316{ 308{
317 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
318 return; 310 return;
311
312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
319 313
320#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
321 scr_overlay_off (); 315 scr_overlay_off ();
322#endif 316#endif
323 317
324 if (display) 318 if (display)
325 { 319 {
326#if USE_XIM 320#if USE_XIM
327 im_ev.stop (display); 321 im_ev.stop (display);
328#endif 322#endif
329#if HAVE_SCROLLBARS
330 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
331#endif 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
332#if TRANSPARENT
333 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
334#endif 326#endif
335 incr_ev.stop (); 327 incr_ev.stop ();
336 termwin_ev.stop (display); 328 termwin_ev.stop (display);
337 vt_ev.stop (display); 329 vt_ev.stop (display);
338 } 330 }
339 331
340 check_ev.stop (); 332 flush_ev.stop ();
341 pty_ev.stop (); 333 pty_ev.stop ();
342#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
343 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
344#endif 336#endif
345#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
353#endif 345#endif
354#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
355 pointer_ev.stop (); 347 pointer_ev.stop ();
356#endif 348#endif
357 349
358 destroy_ev.start (0); 350 destroy_ev.start ();
359} 351}
360 352
361void 353void
362rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
363{ 355{
364 make_current (); 356 make_current ();
365 357
366 delete this; 358 delete this;
367} 359}
… …
378{ 370{
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 372 (*t)->emergency_cleanup ();
381} 373}
382 374
383#if ENABLE_FRILLS 375#if !ENABLE_MINIMAL
384static void 376static void
385print_x_error (Display *dpy, XErrorEvent *event) 377print_x_error (Display *dpy, XErrorEvent *event)
386{ 378{
387 char buffer[BUFSIZ]; 379 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 380 char mesg[BUFSIZ];
… …
421 else 413 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
423 mesg, BUFSIZ); 415 mesg, BUFSIZ);
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 } 417 }
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427 mesg, BUFSIZ); 419 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429} 421}
430#endif 422#endif
431 423
… …
436 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
437 else 429 else
438 { 430 {
439 // GET_R is most likely not the terminal which caused the error, 431 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 432 // so just output the error and continue
441#if ENABLE_FRILLS 433#if ENABLE_MINIMAL
434 old_xerror_handler (display, event);
435#else
442 print_x_error (display, event); 436 print_x_error (display, event);
443#else
444 old_xerror_handler (display, event);
445#endif 437#endif
446 } 438 }
447 439
448 return 0; 440 return 0;
449} 441}
… …
455 DisplayString (display)); 447 DisplayString (display));
456 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
457 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
458} 450}
459 451
460/*----------------------------------------------------------------------*/
461bool
462rxvt_term::init (int argc, const char *const *argv)
463{
464 SET_R (this);
465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
467
468 if (!init_vars ())
469 return false;
470
471 init_secondary ();
472
473 const char **cmd_argv = init_resources (argc, argv);
474
475#ifdef KEYSYM_RESOURCE
476 keyboard->register_done ();
477#endif
478
479#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */
482#endif
483
484#if ENABLE_PERL
485 if (!rs[Rs_perl_ext_1])
486 rs[Rs_perl_ext_1] = "default";
487
488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491 {
492#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493 // ignore some perl-related arguments if some bozo installed us set[ug]id
494 if (rxvt_tainted ())
495 {
496 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500 rs[Rs_perl_lib] = 0;
501 rs[Rs_perl_eval] = 0;
502 }
503 }
504#endif
505 rxvt_perl.init (this);
506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507 }
508#endif
509
510 pty = rxvt_new_ptytty ();
511
512 create_windows (argc, argv);
513
514 dDisp;
515
516 init_xlocale ();
517
518 scr_reset (); // initialize screen
519
520#if 0
521 XSynchronize (disp, True);
522#endif
523
524#ifdef HAVE_SCROLLBARS
525 if (OPTION (Opt_scrollBar))
526 resize_scrollbar (); /* create and map scrollbar */
527#endif
528#ifdef TRANSPARENT
529 if (OPTION (Opt_transparent))
530 {
531 XSelectInput (disp, display->root, PropertyChangeMask);
532 check_our_parents ();
533 rootwin_ev.start (display, display->root);
534 }
535#endif
536
537 XMapWindow (disp, vt);
538 XMapWindow (disp, parent[0]);
539
540 set_colorfgbg ();
541
542 init_command (cmd_argv);
543
544 free (cmd_argv);
545
546 if (pty->pty >= 0)
547 pty_ev.start (pty->pty, EVENT_READ);
548
549 check_ev.start ();
550
551 HOOK_INVOKE ((this, HOOK_START, DT_END));
552
553 return true;
554}
555
556static struct sig_handlers 452static struct sig_handlers
557{ 453{
558 sig_watcher sw_chld, sw_term, sw_int; 454 ev::sig sw_term, sw_int;
559
560 void sig_chld (sig_watcher &w)
561 {
562 // we are being called for every SIGCHLD, find the corresponding term
563 int pid;
564
565 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
566 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
567 if (pid == (*t)->cmd_pid)
568 {
569 (*t)->child_exit ();
570 break;
571 }
572 }
573 455
574 /* 456 /*
575 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
576 */ 458 */
577 void 459 void sig_term (ev::sig &w, int revents);
578 sig_term (sig_watcher &w) 460
461 sig_handlers ()
579 { 462 {
580#ifdef DEBUG_CMD
581 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582#endif
583 rxvt_emergency_cleanup ();
584 signal (w.signum, SIG_DFL);
585 kill (getpid (), w.signum);
586 }
587
588 sig_handlers ()
589 : sw_chld (this, &sig_handlers::sig_chld),
590 sw_term (this, &sig_handlers::sig_term), 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
591 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
592 {
593 } 465 }
594} sig_handlers; 466} sig_handlers;
595 467
468void
469sig_handlers::sig_term (ev::sig &w, int revents)
470{
471 rxvt_emergency_cleanup ();
472 w.stop ();
473 kill (getpid (), w.signum);
474}
475
596char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
597 477
598void 478void
599rxvt_init () 479rxvt_init ()
600{ 480{
601 uid_t uid = getuid (); 481 ptytty::init ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615 482
616 // drop privileges 483 if (!ev_default_loop (0))
617#if HAVE_SETRESUID 484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632 485
633 rxvt_environ = environ; 486 rxvt_environ = environ;
634
635 /*
636 * Save and then give up any super-user privileges
637 * If we need privileges in any area then we must specifically request it.
638 * We should only need to be root in these cases:
639 * 1. write utmp entries on some systems
640 * 2. chown tty on some systems
641 */
642 rxvt_privileges (SAVE);
643 rxvt_privileges (IGNORE);
644 487
645 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
647 490
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
650 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
651 493
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
654 496
655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
657 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
658 500
659 XrmInitialize (); 501 XrmInitialize ();
660} 502}
661 503
662/* ------------------------------------------------------------------------- *
663 * MEMORY ALLOCATION WRAPPERS *
664 * ------------------------------------------------------------------------- */
665void *
666rxvt_malloc (size_t size)
667{
668 void *p = malloc (size);
669
670 if (!p)
671 rxvt_fatal ("memory allocation failure. aborting.\n");
672
673 return p;
674}
675
676void *
677rxvt_calloc (size_t number, size_t size)
678{
679 void *p = calloc (number, size);
680
681 if (!p)
682 rxvt_fatal ("memory allocation failure. aborting.\n");
683
684 return p;
685}
686
687void *
688rxvt_realloc (void *ptr, size_t size)
689{
690 void *p = realloc (ptr, size);
691
692 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n");
694
695 return p;
696}
697
698/* ------------------------------------------------------------------------- *
699 * PRIVILEGED OPERATIONS *
700 * ------------------------------------------------------------------------- */
701/* take care of suid/sgid super-user (root) privileges */
702void
703rxvt_privileges (rxvt_privaction action)
704{
705#if ! defined(__CYGWIN32__)
706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707 /* setreuid () is the poor man's setuid (), seteuid () */
708# define seteuid(a) setreuid(-1, (a))
709# define setegid(a) setregid(-1, (a))
710# define HAVE_SETEUID
711# endif
712# ifdef HAVE_SETEUID
713 switch (action)
714 {
715 case IGNORE:
716 /*
717 * change effective uid/gid - not real uid/gid - so we can switch
718 * back to root later, as required
719 */
720 setegid (getgid ());
721 seteuid (getuid ());
722 break;
723 case SAVE:
724 saved_egid = getegid ();
725 saved_euid = geteuid ();
726 break;
727 case RESTORE:
728 setegid (saved_egid);
729 seteuid (saved_euid);
730 break;
731 }
732# else
733 switch (action)
734 {
735 case IGNORE:
736 setgid (getgid ());
737 setuid (getuid ());
738 /* FALLTHROUGH */
739 case SAVE:
740 /* FALLTHROUGH */
741 case RESTORE:
742 break;
743 }
744# endif
745#endif
746}
747
748/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
749/* 505/*
750 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
751 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
752 */ 508 */
753void 509void
754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
755{ 511{
756 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
757 int x, y, sb_w, flags; 513 int x, y, flags;
758 unsigned int w, h; 514 unsigned int w, h;
759 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
760 dDisp;
761
762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
763 ncol, nrow, szHint.width, szHint.height));
764 516
765 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
766 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
767 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 519 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768 520
… …
776 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
777 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
778 530
779 if (flags & WidthValue) 531 if (flags & WidthValue)
780 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
781 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
782 szHint.flags |= USSize; 537 szHint.flags |= USSize;
783 } 538 }
784 539
785 if (flags & HeightValue) 540 if (flags & HeightValue)
786 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
787 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
788 szHint.flags |= USSize; 546 szHint.flags |= USSize;
789 } 547 }
790 548
791 if (flags & XValue) 549 if (flags & XValue)
792 { 550 {
… …
823 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
824 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
825 583
826 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
827 585
828 sb_w = 0;
829 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
830 587
831 if (scrollBar.state) 588 if (scrollBar.state)
832 { 589 {
833 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
834 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
592
835 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
836 window_vt_x += sb_w; 594 window_vt_x += sb_w;
837 } 595 }
838 596
839 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
840 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
841 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
842 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
843 601
844 if (newwidth && newwidth - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
845 { 603 {
846 szHint.width = newwidth; 604 szHint.width = newwidth;
… …
861 { 619 {
862 min_it (height, max_height); 620 min_it (height, max_height);
863 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
864 } 622 }
865 623
866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
867 window_sb_x = szHint.width - sb_w;
868
869 if (recalc_x) 624 if (recalc_x)
870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626
871 if (recalc_y) 627 if (recalc_y)
872 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
873 629
874 ncol = width / fwidth; 630 ncol = width / fwidth;
875 nrow = height / fheight; 631 nrow = height / fheight;
876 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
877 ncol, nrow, szHint.width,
878 szHint.height));
879 return;
880} 632}
881 633
882/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
883/* 635/*
884 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
… …
894 646
895 ws.ws_col = ncol; 647 ws.ws_col = ncol;
896 ws.ws_row = nrow; 648 ws.ws_row = nrow;
897 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
898 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
900 652
901#if 0 653#if 0
902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
903 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
904 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
905#endif 657#endif
906} 658}
907 659
… …
936 delete fontset[0]; 688 delete fontset[0];
937 fontset[0] = fs; 689 fontset[0] = fs;
938 690
939 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
940 prop.height += lineSpace; 692 prop.height += lineSpace;
693 prop.width += letterSpace;
694
941 fs->set_prop (prop); 695 fs->set_prop (prop, false);
942 696
943 fwidth = prop.width; 697 fwidth = prop.width;
944 fheight = prop.height; 698 fheight = prop.height;
945 fbase = prop.ascent; 699 fbase = prop.ascent;
946 700
… …
955 { 709 {
956 fontset[style] = fs = new rxvt_fontset (this); 710 fontset[style] = fs = new rxvt_fontset (this);
957 rxvt_fontprop prop2 = prop; 711 rxvt_fontprop prop2 = prop;
958 712
959 if (res) 713 if (res)
960 prop2.weight = prop2.slant = rxvt_fontprop::unset; 714 {
715 fs->populate (res);
716 fs->set_prop (prop2, false);
717 }
961 else 718 else
962 { 719 {
963 res = fontset[0]->fontdesc; 720 fs->populate (fontset[0]->fontdesc);
964 721
965 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 722 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
966 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 723 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
724
725 fs->set_prop (prop2, true);
967 } 726 }
968 727
969 fs->populate (res);
970 fs->set_prop (prop2);
971 } 728 }
972#else 729#else
973 fontset[style] = fontset[0]; 730 fontset[style] = fontset[0];
974#endif 731#endif
975 } 732 }
… …
977 if (parent[0]) 734 if (parent[0])
978 { 735 {
979 resize_all_windows (0, 0, 0); 736 resize_all_windows (0, 0, 0);
980 scr_remap_chars (); 737 scr_remap_chars ();
981 scr_touch (true); 738 scr_touch (true);
982 } 739 }
983 740
984 return true; 741 return true;
985} 742}
986 743
744void
987void rxvt_term::set_string_property (Atom prop, const char *str, int len) 745rxvt_term::set_string_property (Atom prop, const char *str, int len)
988{ 746{
989 XChangeProperty (display->display, parent[0], 747 XChangeProperty (dpy, parent[0],
990 prop, XA_STRING, 8, PropModeReplace, 748 prop, XA_STRING, 8, PropModeReplace,
991 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 749 (const unsigned char *)str, len >= 0 ? len : strlen (str));
992} 750}
993 751
752void
994void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 753rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
995{ 754{
996 wchar_t *ws = rxvt_mbstowcs (str, len); 755 wchar_t *ws = rxvt_mbstowcs (str, len);
997 char *s = rxvt_wcstoutf8 (ws); 756 char *s = rxvt_wcstoutf8 (ws);
998 757
999 XChangeProperty (display->display, parent[0], 758 XChangeProperty (dpy, parent[0],
1000 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 759 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1001 (const unsigned char *)s, strlen (s)); 760 (const unsigned char *)s, strlen (s));
1002 761
1003 free (s); 762 free (s);
1004 free (ws); 763 free (ws);
… …
1023#if ENABLE_EWMH 782#if ENABLE_EWMH
1024 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 783 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
1025#endif 784#endif
1026} 785}
1027 786
787void
788rxvt_term::set_window_color (int idx, const char *color)
789{
1028#ifdef XTERM_COLOR_CHANGE 790#ifdef XTERM_COLOR_CHANGE
1029void
1030rxvt_term::set_window_color (int idx, const char *color)
1031{
1032 rxvt_color xcol; 791 rxvt_color xcol;
1033 int i;
1034 792
1035 if (color == NULL || *color == '\0') 793 if (color == NULL || *color == '\0')
1036 return; 794 return;
1037 795
796 color = strdup (color);
797 allocated.push_back ((void *)color);
798 rs[Rs_color + idx] = color;
799
1038 /* handle color aliases */ 800 /* handle color aliases */
1039 if (isdigit (*color)) 801 if (isdigit (*color))
1040 { 802 {
1041 i = atoi (color); 803 int i = atoi (color);
1042 804
1043 if (i >= 8 && i <= 15) 805 if (i >= 8 && i <= 15)
806 {
1044 { /* bright colors */ 807 /* bright colors */
1045 i -= 8;
1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 808 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1047 SET_PIXCOLOR (idx);
1048 goto done; 809 goto done;
1049 } 810 }
1050 811
1051 if (i >= 0 && i <= 7) 812 if (i >= 0 && i <= 7)
813 {
1052 { /* normal colors */ 814 /* normal colors */
1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 815 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1054 SET_PIXCOLOR (idx);
1055 goto done; 816 goto done;
1056 } 817 }
1057 } 818 }
1058 819
1059 if (!rXParseAllocColor (&xcol, color)) 820 set_color (xcol, color);
1060 return;
1061
1062 /* XStoreColor (display->display, display->cmap, XColor*); */
1063 821
1064 /* 822 /*
1065 * FIXME: should free colors here, but no idea how to do it so instead, 823 * FIXME: should free colors here, but no idea how to do it so instead,
1066 * so just keep gobbling up the colormap 824 * so just keep gobbling up the colormap
1067 */ 825 */
1068# if 0
1069 for (i = Color_Black; i <= Color_White; i++)
1070 if (pix_colors[idx] == pix_colors[i])
1071 break;
1072 if (i > Color_White)
1073 {
1074 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1075 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1076 DisplayPlanes (display->display, display->screen));
1077 }
1078# endif
1079 826
1080 pix_colors_focused[idx] = xcol; 827 pix_colors_focused[idx] = xcol;
1081 SET_PIXCOLOR (idx);
1082 828
1083 /* XSetWindowAttributes attr; */
1084 /* Cursor cursor; */
1085done: 829done:
1086
1087#if OFF_FOCUS_FADING
1088 if (rs[Rs_fade])
1089 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1090#endif
1091
1092 /*TODO: handle Color_BD, scrollbar background, etc. */ 830 /*TODO: handle Color_BD, scrollbar background, etc. */
1093 831
832 update_fade_color (idx);
1094 recolour_cursor (); 833 recolour_cursor ();
1095 scr_recolour (); 834 scr_recolour ();
835#endif /* XTERM_COLOR_CHANGE */
1096} 836}
1097
1098#else
1099# define set_window_color (idx,color) ((void)0)
1100#endif /* XTERM_COLOR_CHANGE */
1101 837
1102void 838void
1103rxvt_term::recolour_cursor () 839rxvt_term::recolour_cursor ()
1104{ 840{
1105 XColor xcol[2]; 841 XColor fg, bg;
1106 842
1107 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 843 (ISSET_PIXCOLOR (Color_pointer_fg)
1108 ? pix_colors_focused[Color_pointer_fg] 844 ? pix_colors_focused[Color_pointer_fg]
1109 : pix_colors_focused[Color_fg]; 845 : pix_colors_focused[Color_fg]).get (fg);
846
1110 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 847 (ISSET_PIXCOLOR (Color_pointer_bg)
1111 ? pix_colors_focused[Color_pointer_bg] 848 ? pix_colors_focused[Color_pointer_bg]
1112 : pix_colors_focused[Color_bg]; 849 : pix_colors_focused[Color_bg]).get (bg);
1113 850
1114 XQueryColors (display->display, display->cmap, xcol, 2); 851 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1115 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1116} 852}
1117 853
1118/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
1119/* 855/*
1120 * find if fg/bg matches any of the normal (low-intensity) colors 856 * find if fg/bg matches any of the normal (low-intensity) colors
1121 */ 857 */
1122void 858void
1123rxvt_term::set_colorfgbg () 859rxvt_term::set_colorfgbg ()
1124{ 860{
1125 unsigned int i; 861 unsigned int i;
1126 const char *xpmb = "\0"; 862 const char *xpmb = "";
1127 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 863 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1128 864
1129 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1130 strcpy (fstr, "default"); 865 strcpy (fstr, "default");
1131 strcpy (bstr, "default"); 866 strcpy (bstr, "default");
1132 for (i = Color_Black; i <= Color_White; i++) 867 for (i = Color_Black; i <= Color_White; i++)
1133 if (pix_colors[Color_fg] == pix_colors[i]) 868 if (pix_colors[Color_fg] == pix_colors[i])
1134 { 869 {
… …
1138 873
1139 for (i = Color_Black; i <= Color_White; i++) 874 for (i = Color_Black; i <= Color_White; i++)
1140 if (pix_colors[Color_bg] == pix_colors[i]) 875 if (pix_colors[Color_bg] == pix_colors[i])
1141 { 876 {
1142 sprintf (bstr, "%d", (i - Color_Black)); 877 sprintf (bstr, "%d", (i - Color_Black));
1143#ifdef XPM_BACKGROUND 878#ifdef BG_IMAGE_FROM_FILE
1144 xpmb = "default;"; 879 xpmb = "default;";
1145#endif 880#endif
1146 break; 881 break;
1147 } 882 }
1148 883
1149 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 884 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1150} 885}
1151 886
1152/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
1153 888
1154int 889bool
1155rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 890rxvt_term::set_color (rxvt_color &color, const char *name)
1156{ 891{
1157 if (!screen_in_out->set (display, colour)) 892 if (color.set (this, name))
1158 {
1159 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1160 return false;
1161 }
1162
1163 return true; 893 return true;
894
895 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
896 return false;
897}
898
899void
900rxvt_term::alias_color (int dst, int src)
901{
902 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1164} 903}
1165 904
1166/* -------------------------------------------------------------------- * 905/* -------------------------------------------------------------------- *
1167 * - WINDOW RESIZING - * 906 * - WINDOW RESIZING - *
1168 * -------------------------------------------------------------------- */ 907 * -------------------------------------------------------------------- */
1169void 908void
1170rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 909rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1171{ 910{
1172 int fix_screen; 911 int fix_screen;
1173 int old_width = szHint.width, old_height = szHint.height; 912 int old_width = szHint.width;
1174 dDisp; 913 int old_height = szHint.height;
1175 914
1176 window_calc (newwidth, newheight); 915 window_calc (newwidth, newheight);
916
917 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
918
919 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
920 if (set_hint)
921 {
922 szHint.flags &= ~(PBaseSize | PResizeInc);
1177 XSetWMNormalHints (disp, parent[0], &szHint); 923 XSetWMNormalHints (dpy, parent[0], &szHint);
924 szHint.flags |= PBaseSize | PResizeInc;
925 }
1178 926
1179 if (!ignoreparent) 927 if (!ignoreparent)
1180 { 928 {
1181#ifdef SMART_RESIZE 929#ifdef SMART_RESIZE
1182 /* 930 /*
… …
1186 int x, y, x1, y1; 934 int x, y, x1, y1;
1187 int dx, dy; 935 int dx, dy;
1188 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 936 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1189 Window unused_cr; 937 Window unused_cr;
1190 938
1191 XTranslateCoordinates (disp, parent[0], display->root, 939 XTranslateCoordinates (dpy, parent[0], display->root,
1192 0, 0, &x, &y, &unused_cr); 940 0, 0, &x, &y, &unused_cr);
1193 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 941 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1194 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 942 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1195 /* 943 /*
1196 * if display->root isn't the parent window, a WM will probably have offset 944 * if display->root isn't the parent window, a WM will probably have offset
1197 * our position for handles and decorations. Counter it 945 * our position for handles and decorations. Counter it
1198 */ 946 */
… …
1200 { 948 {
1201 x -= x1; 949 x -= x1;
1202 y -= y1; 950 y -= y1;
1203 } 951 }
1204 952
1205 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 953 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1206 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 954 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1207 dx = old_width - szHint.width; 955 dx = old_width - szHint.width;
1208 dy = old_height - szHint.height; 956 dy = old_height - szHint.height;
1209 957
1210 /* Check position of the center of the window */ 958 /* Check position of the center of the window */
1211 if (x < x1) /* left half */ 959 if (x < x1) /* left half */
1212 dx = 0; 960 dx = 0;
… …
1215 if (y < y1) /* top half */ 963 if (y < y1) /* top half */
1216 dy = 0; 964 dy = 0;
1217 else if (y == y1) /* exact center */ 965 else if (y == y1) /* exact center */
1218 dy /= 2; 966 dy /= 2;
1219 967
1220 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 968 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1221 szHint.width, szHint.height); 969 szHint.width, szHint.height);
1222#else 970#else
1223 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 971 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1224#endif 972#endif
1225 } 973 }
974
975 if (set_hint)
976 XSetWMNormalHints (dpy, parent[0], &szHint);
1226 977
1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1228 979
1229 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1230 { 981 {
1231 if (scrollBar.state) 982 if (scrollBar.state)
1232 { 983 scrollBar.resize ();
1233 XMoveResizeWindow (disp, scrollBar.win,
1234 window_sb_x, 0,
1235 scrollbar_TotalWidth (), szHint.height);
1236 resize_scrollbar ();
1237 }
1238 984
1239 XMoveResizeWindow (disp, vt, 985 XMoveResizeWindow (dpy, vt,
1240 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1241 width, height); 987 width, height);
1242 988
1243 scr_clear (); 989#ifdef HAVE_BG_PIXMAP
1244#ifdef XPM_BACKGROUND 990 if (bgPixmap.window_size_sensitive ())
1245 resize_pixmap (); 991 update_background ();
1246#endif 992#endif
1247 } 993 }
1248 994
1249 if (fix_screen || old_height == 0) 995 if (fix_screen || old_height == 0)
1250 {
1251 int curr_screen = -1;
1252 int old_ncol = prev_ncol;
1253
1254 /* scr_reset only works on the primary screen */
1255 if (old_height) /* this is not the first time through */
1256 {
1257 unsigned int ocol = ncol;
1258 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1259 curr_screen = scr_change_screen (PRIMARY);
1260 ncol = ocol;
1261 }
1262
1263 scr_reset (); 996 scr_reset ();
1264 997
1265 if (curr_screen >= 0) /* this is not the first time through */ 998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1266 { 999 //scr_touch (false);
1267 scr_change_screen (curr_screen);
1268 selection_check (old_ncol != ncol ? 4 : 0);
1269 }
1270 }
1271 1000
1272 old_width = szHint.width; 1001#ifdef HAVE_BG_PIXMAP
1273 old_height = szHint.height; 1002// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1274 1003// if (bgPixmap.pixmap)
1275#ifdef XPM_BACKGROUND
1276 if (pixmap)
1277 scr_touch (false); 1004// scr_touch (false);
1278#endif 1005#endif
1279 1006
1280#ifdef USE_XIM 1007#ifdef USE_XIM
1281 IMSetStatusPosition (); 1008 IMSetPosition ();
1282#endif 1009#endif
1283} 1010}
1284 1011
1285/* 1012/*
1286 * Set the width/height of the vt window in characters. Units are pixels. 1013 * Set the width/height of the vt window in characters. Units are pixels.
… …
1291{ 1018{
1292 XWindowAttributes wattr; 1019 XWindowAttributes wattr;
1293 1020
1294 if (newwidth == 0 || newheight == 0) 1021 if (newwidth == 0 || newheight == 0)
1295 { 1022 {
1296 XGetWindowAttributes (display->display, display->root, &wattr); 1023 XGetWindowAttributes (dpy, display->root, &wattr);
1297 1024
1298 if (newwidth == 0) 1025 if (newwidth == 0)
1299 newwidth = wattr.width - szHint.base_width; 1026 newwidth = wattr.width - szHint.base_width;
1300 if (newheight == 0) 1027 if (newheight == 0)
1301 newheight = wattr.height - szHint.base_height; 1028 newheight = wattr.height - szHint.base_height;
… …
1315#ifdef USE_XIM 1042#ifdef USE_XIM
1316 1043
1317void 1044void
1318rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1045rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1319{ 1046{
1320 fg = pix_colors[Color_fg]; 1047 fg = pix_colors [Color_fg];
1321 bg = pix_colors[Color_bg]; 1048 bg = pix_colors [Color_bg];
1322} 1049}
1323 1050
1324void 1051void
1325rxvt_term::im_set_size (XRectangle &size) 1052rxvt_term::im_set_size (XRectangle &size)
1326{ 1053{
… …
1349 1076
1350/* Checking whether input method is running. */ 1077/* Checking whether input method is running. */
1351bool 1078bool
1352rxvt_term::IMisRunning () 1079rxvt_term::IMisRunning ()
1353{ 1080{
1354 char *p;
1355 Atom atom; 1081 Atom atom;
1356 Window win; 1082 Window win;
1357 char server[IMBUFSIZ]; 1083 char server[IMBUFSIZ];
1358 1084
1359 /* get current locale modifier */ 1085 /* get current locale modifier */
1360 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1086 if (char *p = XSetLocaleModifiers (0))
1361 { 1087 {
1362 strcpy (server, "@server="); 1088 strcpy (server, "@server=");
1363 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1089 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1364 1090
1365 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1091 if (p = strchr (server + 1, '@')) /* first one only */
1366 *p = '\0'; 1092 *p = '\0';
1367 1093
1368 atom = XInternAtom (display->display, server, False); 1094 atom = XInternAtom (dpy, server, False);
1369 win = XGetSelectionOwner (display->display, atom); 1095 win = XGetSelectionOwner (dpy, atom);
1370 1096
1371 if (win != None) 1097 if (win != None)
1372 return True; 1098 return True;
1373 } 1099 }
1374 1100
… …
1381 XPoint nspot; 1107 XPoint nspot;
1382 XVaNestedList preedit_attr; 1108 XVaNestedList preedit_attr;
1383 1109
1384 if (!Input_Context 1110 if (!Input_Context
1385 || !focus 1111 || !focus
1386 || !(input_style & XIMPreeditPosition)) 1112 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1387 return; 1113 return;
1388 1114
1389 im_set_position (nspot); 1115 im_set_position (nspot);
1390 1116
1391 if (nspot.x == spot.x && nspot.y == spot.y) 1117 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1410 input_method = 0; 1136 input_method = 0;
1411 } 1137 }
1412 1138
1413 Input_Context = 0; 1139 Input_Context = 0;
1414} 1140}
1141
1142#ifdef ENABLE_XIM_ONTHESPOT
1143
1144static void
1145xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1146{
1147 ((rxvt_term *)client_data)->make_current ();
1148 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1149}
1150
1151static void
1152xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1153{
1154 ((rxvt_term *)client_data)->make_current ();
1155 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1156}
1157
1158static void
1159xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1160{
1161 rxvt_term *term = (rxvt_term *)client_data;
1162 XIMText *text = call_data->text;
1163
1164 term->make_current ();
1165
1166 if (text)
1167 {
1168 void *str;
1169
1170 if (!text->encoding_is_wchar && text->string.multi_byte)
1171 {
1172 // of course, X makes it ugly again
1173 if (term->rs[Rs_imLocale])
1174 SET_LOCALE (term->rs[Rs_imLocale]);
1175
1176 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1177 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1178
1179 if (term->rs[Rs_imLocale])
1180 SET_LOCALE (term->locale);
1181 }
1182 else
1183 str = (void *)text->string.wide_char;
1184
1185 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1186 DT_INT, call_data->caret,
1187 DT_INT, call_data->chg_first,
1188 DT_INT, call_data->chg_length,
1189 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1190 DT_WCS_LEN, str, str ? (int)text->length : 0,
1191 DT_END));
1192 }
1193 else
1194 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1195 DT_INT, call_data->caret,
1196 DT_INT, call_data->chg_first,
1197 DT_INT, call_data->chg_length,
1198 DT_END));
1199}
1200
1201#if 0
1202static void
1203xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1204{
1205 ((rxvt_term *)client_data)->make_current ();
1206 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1207 DT_INT, call_data->position,
1208 DT_INT, call_data->direction,
1209 DT_INT, call_data->style,
1210 DT_END));
1211}
1212#endif
1213
1214#endif
1415 1215
1416/* 1216/*
1417 * Try to open a XIM with the current modifiers, then see if we can 1217 * Try to open a XIM with the current modifiers, then see if we can
1418 * open a suitable preedit type 1218 * open a suitable preedit type
1419 */ 1219 */
… …
1426 XRectangle rect, status_rect, needed_rect; 1226 XRectangle rect, status_rect, needed_rect;
1427 unsigned long fg, bg; 1227 unsigned long fg, bg;
1428 const char *p; 1228 const char *p;
1429 char **s; 1229 char **s;
1430 XIMStyles *xim_styles; 1230 XIMStyles *xim_styles;
1231#ifdef ENABLE_XIM_ONTHESPOT
1232 XIMCallback xcb[4];
1233#endif
1431 1234
1432 set_environ (envv); 1235 set_environ (envv);
1433 1236
1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1237 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435 return false; 1238 return false;
1436 1239
1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438 input_method = display->get_xim (locale, modifiers); 1240 input_method = display->get_xim (locale, modifiers);
1439 if (input_method == NULL) 1241 if (input_method == NULL)
1440 return false; 1242 return false;
1441 1243
1442 xim = input_method->xim; 1244 xim = input_method->xim;
… …
1462 s = rxvt_splitcommastring (p); 1264 s = rxvt_splitcommastring (p);
1463 1265
1464 for (i = found = 0; !found && s[i]; i++) 1266 for (i = found = 0; !found && s[i]; i++)
1465 { 1267 {
1466 if (!strcmp (s[i], "OverTheSpot")) 1268 if (!strcmp (s[i], "OverTheSpot"))
1467 input_style = (XIMPreeditPosition | XIMStatusNothing); 1269 input_style = XIMPreeditPosition | XIMStatusNothing;
1468 else if (!strcmp (s[i], "OffTheSpot")) 1270 else if (!strcmp (s[i], "OffTheSpot"))
1469 input_style = (XIMPreeditArea | XIMStatusArea); 1271 input_style = XIMPreeditArea | XIMStatusArea;
1470 else if (!strcmp (s[i], "Root")) 1272 else if (!strcmp (s[i], "Root"))
1471 input_style = (XIMPreeditNothing | XIMStatusNothing); 1273 input_style = XIMPreeditNothing | XIMStatusNothing;
1472 else if (!strcmp (s[i], "None")) 1274 else if (!strcmp (s[i], "None"))
1473 input_style = (XIMPreeditNone | XIMStatusNone); 1275 input_style = XIMPreeditNone | XIMStatusNone;
1276#ifdef ENABLE_XIM_ONTHESPOT
1277 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1278 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1279#endif
1280 else
1281 input_style = XIMPreeditNothing | XIMStatusNothing;
1474 1282
1475 for (j = 0; j < xim_styles->count_styles; j++) 1283 for (j = 0; j < xim_styles->count_styles; j++)
1476 if (input_style == xim_styles->supported_styles[j]) 1284 if (input_style == xim_styles->supported_styles[j])
1477 { 1285 {
1478 rxvt_freecommastring (s); 1286 rxvt_freecommastring (s);
… …
1516 "*", 1324 "*",
1517 fheight, 1325 fheight,
1518 fheight + 1, fheight - 1, 1326 fheight + 1, fheight - 1,
1519 fheight - 2, fheight + 2); 1327 fheight - 2, fheight + 2);
1520 1328
1521 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1329 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1522 &missing_charset_list, &missing_charset_count, &def_string); 1330 &missing_charset_list, &missing_charset_count, &def_string);
1523 1331
1524 if (missing_charset_list) 1332 if (missing_charset_list)
1525 XFreeStringList (missing_charset_list); 1333 XFreeStringList (missing_charset_list);
1526 1334
… …
1567 XNBackground, bg, 1375 XNBackground, bg,
1568 XNArea, &status_rect, 1376 XNArea, &status_rect,
1569 XNFontSet, fs, 1377 XNFontSet, fs,
1570 NULL); 1378 NULL);
1571 } 1379 }
1380#if ENABLE_XIM_ONTHESPOT
1381 else if (input_style & XIMPreeditCallbacks)
1382 {
1383 im_set_position (spot);
1384
1385 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1386 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1387 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1388# if 0
1389 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1390# endif
1391
1392 preedit_attr = XVaCreateNestedList (0,
1393 XNSpotLocation, &spot,
1394 XNPreeditStartCallback, &xcb[0],
1395 XNPreeditDoneCallback , &xcb[1],
1396 XNPreeditDrawCallback , &xcb[2],
1397# if 0
1398 XNPreeditCaretCallback, &xcb[3],
1399# endif
1400 NULL);
1401 }
1402#endif
1572 1403
1573 Input_Context = XCreateIC (xim, 1404 Input_Context = XCreateIC (xim,
1574 XNInputStyle, input_style, 1405 XNInputStyle, input_style,
1575 XNClientWindow, vt, 1406 XNClientWindow, vt,
1576 XNFocusWindow, parent[0], 1407 XNFocusWindow, parent[0],
… …
1578 preedit_attr, 1409 preedit_attr,
1579 status_attr ? XNStatusAttributes : NULL, 1410 status_attr ? XNStatusAttributes : NULL,
1580 status_attr, NULL); 1411 status_attr, NULL);
1581 1412
1582 if (preedit_attr) XFree (preedit_attr); 1413 if (preedit_attr) XFree (preedit_attr);
1583 if (status_attr) XFree (status_attr); 1414 if (status_attr) XFree (status_attr);
1584 if (fs) XFreeFontSet (display->display, fs); 1415 if (fs) XFreeFontSet (dpy, fs);
1585 1416
1586 if (Input_Context == NULL) 1417 if (Input_Context == NULL)
1587 { 1418 {
1588 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1419 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589 im_destroy (); 1420 im_destroy ();
1590 return false; 1421 return false;
1591 } 1422 }
1592 1423
1593 if (input_style & XIMPreeditArea) 1424#if 0
1425 // unfortunately, only the focus window is used by XIM, hard to fix
1426 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1427 vt_select_input ();
1428#endif
1429
1594 IMSetStatusPosition (); 1430 IMSetPosition ();
1595 1431
1596 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597 return true; 1432 return true;
1598} 1433}
1599 1434
1600void 1435void
1601rxvt_term::im_cb () 1436rxvt_term::im_cb ()
… …
1607 1442
1608 make_current (); 1443 make_current ();
1609 1444
1610 im_destroy (); 1445 im_destroy ();
1611 1446
1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613 if (Input_Context) 1447 if (Input_Context)
1614 return; 1448 return;
1615 1449
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1450#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale]) 1451 if (rs[Rs_imLocale])
… …
1659 SET_LOCALE (locale); 1493 SET_LOCALE (locale);
1660#endif 1494#endif
1661} 1495}
1662 1496
1663void 1497void
1664rxvt_term::IMSetStatusPosition () 1498rxvt_term::IMSetPosition ()
1665{ 1499{
1666 XRectangle preedit_rect, status_rect, *needed_rect; 1500 XRectangle preedit_rect, status_rect, *needed_rect;
1667 XVaNestedList preedit_attr, status_attr; 1501 XVaNestedList preedit_attr, status_attr;
1668 1502
1669 if (!Input_Context 1503 if (!Input_Context
1670 || !focus 1504 || !focus
1671 || !(input_style & XIMPreeditArea) 1505 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1672 || !IMisRunning ()) 1506 || !IMisRunning ())
1673 return; 1507 return;
1674 1508
1509 if (input_style & XIMPreeditPosition)
1510 {
1511 im_set_size (preedit_rect);
1512 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1513
1514 XSetICValues (Input_Context,
1515 XNPreeditAttributes, preedit_attr, NULL);
1516 }
1517 else
1518 {
1675 /* Getting the necessary width of preedit area */ 1519 /* Getting the necessary width of preedit area */
1676 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1520 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1677 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1521 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1678 XFree (status_attr); 1522 XFree (status_attr);
1679 1523
1680 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1524 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1681 XFree (needed_rect); 1525 XFree (needed_rect);
1682 1526
1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1527 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1684 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1528 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1685 1529
1686 XSetICValues (Input_Context, 1530 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, 1531 XNPreeditAttributes, preedit_attr,
1688 XNStatusAttributes, status_attr, NULL); 1532 XNStatusAttributes, status_attr,
1533 NULL);
1689 1534
1535 XFree (status_attr);
1536 }
1537
1690 XFree (preedit_attr); 1538 XFree (preedit_attr);
1691 XFree (status_attr);
1692} 1539}
1693#endif /* USE_XIM */ 1540#endif /* USE_XIM */
1694 1541
1695/*----------------------------------------------------------------------*/ 1542void
1696rxvt_t rxvt_current_term; 1543rxvt_term::get_window_origin (int &x, int &y)
1544{
1545 Window cr;
1546 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1547/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1548}
1549
1550Pixmap
1551rxvt_term::get_pixmap_property (int prop_id)
1552{
1553 if (prop_id > 0 && prop_id < NUM_XA)
1554 if (xa[prop_id])
1555 {
1556 int aformat;
1557 unsigned long nitems, bytes_after;
1558 Atom atype;
1559 unsigned char *prop = NULL;
1560 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1561 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1562 &nitems, &bytes_after, &prop);
1563 if (result == Success && prop && atype == XA_PIXMAP)
1564 return *(Pixmap *)prop;
1565 }
1566
1567 return None;
1568}
1569
1570#ifdef HAVE_BG_PIXMAP
1571# if TRACE_PIXMAPS
1572# undef update_background
1573void
1574rxvt_term::trace_update_background (const char *file, int line)
1575{
1576 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1577 update_background ();
1578}
1579# endif
1580
1581void
1582rxvt_term::update_background ()
1583{
1584 if (update_background_ev.is_active ())
1585 return;
1586
1587 bgPixmap.invalidate ();
1588
1589 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1590
1591 if (to_wait <= 0.)
1592 bgPixmap.render ();
1593 else
1594 update_background_ev.start (to_wait);
1595}
1596
1597void
1598rxvt_term::update_background_cb (ev::timer &w, int revents)
1599{
1600 make_current ();
1601
1602 update_background_ev.stop ();
1603 bgPixmap.render ();
1604 refresh_check ();
1605}
1606
1607#endif /* HAVE_BG_PIXMAP */
1697 1608
1698/*----------------------- end-of-file (C source) -----------------------*/ 1609/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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