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

Diff Legend

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