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.325 by root, Wed Mar 31 22:22:32 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 {
106 if (cc->c2 == c2) return c1; 102 if (cc->c2 == c2) return c1;
107 cc = (*this)[cc->c1]; 103 cc = (*this)[cc->c1];
108 } 104 }
109 105
110 // check to see wether this combination already exists otherwise 106 // check to see whether this combination already exists otherwise
111 for (cc = v.end (); cc-- > v.begin (); ) 107 for (cc = v.end (); cc-- > v.begin (); )
112 { 108 {
113 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
114 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
115 } 111 }
… …
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 ();
242 selection_clear (true);
237 243
238#ifdef USE_XIM 244#ifdef USE_XIM
239 im_destroy (); 245 im_destroy ();
240#endif 246#endif
241#ifdef XTERM_SCROLLBAR 247 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); 248 if (gc) XFreeGC (dpy, gc);
266 249
267 delete drawable; 250 delete drawable;
268 // destroy all windows 251 // destroy all windows
269 if (parent[0]) 252 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 253 XDestroyWindow (dpy, parent[0]);
271 }
272 254
273 // TODO: free pixcolours, colours should become part of rxvt_display 255 for (int i = 0; i < TOTAL_COLORS; i++)
274 delete pix_colors_focused; 256 if (ISSET_PIXCOLOR (i))
257 {
258 pix_colors_focused [i].free (this);
275#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
276 delete pix_colors_unfocused; 260 pix_colors_unfocused [i].free (this);
277#endif 261#endif
262 }
278 263
264 clear ();
265
266 display->flush (); /* ideally .put should do this */
279 displays.put (display); 267 displays.put (display);
268 }
280 269
281 scr_release (); 270 scr_release ();
282 271
283 /* clear all resources */ 272 /* clear all resources */
284 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
285 free (allocated [i]); 274 free (allocated [i]);
286 275
287 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
288 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
289 free (env_windowid);
290 free (env_display); 279 free (env_display);
291 free (env_term); 280 free (env_term);
292 free (env_colorfgbg);
293 free (locale); 281 free (locale);
294 free (v_buffer); 282 free (v_buffer);
295 free (incr_buf); 283 free (incr_buf);
296 284
297 delete envv; 285 delete envv;
298 delete argv; 286 delete argv;
299 287
300#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
301 delete keyboard; 289 delete keyboard;
302#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
303} 294}
304 295
296// child has exited, usually destroys
305void 297void
306rxvt_term::child_exit () 298rxvt_term::child_cb (ev::child &w, int status)
307{ 299{
300 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
301
308 cmd_pid = 0; 302 cmd_pid = 0;
309 303
310 if (!OPTION (Opt_hold)) 304 if (!option (Opt_hold))
311 destroy (); 305 destroy ();
312} 306}
313 307
314void 308void
315rxvt_term::destroy () 309rxvt_term::destroy ()
316{ 310{
317 if (destroy_ev.active) 311 if (destroy_ev.is_active ())
318 return; 312 return;
313
314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
319 315
320#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
321 scr_overlay_off (); 317 scr_overlay_off ();
322#endif 318#endif
323 319
324 if (display) 320 if (display)
325 { 321 {
326#if USE_XIM 322#if USE_XIM
327 im_ev.stop (display); 323 im_ev.stop (display);
328#endif 324#endif
329#if HAVE_SCROLLBARS
330 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
331#endif 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
332#if TRANSPARENT
333 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
334#endif 328#endif
335 incr_ev.stop (); 329 incr_ev.stop ();
336 termwin_ev.stop (display); 330 termwin_ev.stop (display);
337 vt_ev.stop (display); 331 vt_ev.stop (display);
338 } 332 }
339 333
340 check_ev.stop (); 334 flush_ev.stop ();
341 pty_ev.stop (); 335 pty_ev.stop ();
342#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
343 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
344#endif 338#endif
345#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
353#endif 347#endif
354#ifdef POINTER_BLANK 348#ifdef POINTER_BLANK
355 pointer_ev.stop (); 349 pointer_ev.stop ();
356#endif 350#endif
357 351
358 destroy_ev.start (0); 352 destroy_ev.start ();
359} 353}
360 354
361void 355void
362rxvt_term::destroy_cb (time_watcher &w) 356rxvt_term::destroy_cb (ev::idle &w, int revents)
363{ 357{
364 make_current (); 358 make_current ();
365 359
366 delete this; 360 delete this;
367} 361}
… …
378{ 372{
379 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++)
380 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
381} 375}
382 376
383#if ENABLE_FRILLS 377#if !ENABLE_MINIMAL
384static void 378static void
385print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
386{ 380{
387 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
… …
421 else 415 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
423 mesg, BUFSIZ); 417 mesg, BUFSIZ);
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 } 419 }
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427 mesg, BUFSIZ); 421 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429} 423}
430#endif 424#endif
431 425
… …
436 GET_R->allowedxerror = event->error_code; 430 GET_R->allowedxerror = event->error_code;
437 else 431 else
438 { 432 {
439 // 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,
440 // so just output the error and continue 434 // so just output the error and continue
441#if ENABLE_FRILLS 435#if ENABLE_MINIMAL
436 old_xerror_handler (display, event);
437#else
442 print_x_error (display, event); 438 print_x_error (display, event);
443#else
444 old_xerror_handler (display, event);
445#endif 439#endif
446 } 440 }
447 441
448 return 0; 442 return 0;
449} 443}
… …
455 DisplayString (display)); 449 DisplayString (display));
456 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
457 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
458} 452}
459 453
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 454static struct sig_handlers
557{ 455{
558 sig_watcher sw_chld, sw_term, sw_int; 456 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 457
574 /* 458 /*
575 * Catch a fatal signal and tidy up before quitting 459 * Catch a fatal signal and tidy up before quitting
576 */ 460 */
577 void 461 void sig_term (ev::sig &w, int revents);
578 sig_term (sig_watcher &w) 462
463 sig_handlers ()
579 { 464 {
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), 465 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
591 sw_int (this, &sig_handlers::sig_term) 466 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
592 {
593 } 467 }
594} sig_handlers; 468} sig_handlers;
595 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
596char **rxvt_environ; // startup environment 478char **rxvt_environ; // startup environment
597 479
598void 480void
599rxvt_init () 481rxvt_init ()
600{ 482{
601 uid_t uid = getuid (); 483 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 484
616 // drop privileges 485 if (!ev_default_loop (0))
617#if HAVE_SETRESUID 486 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 487
633 rxvt_environ = environ; 488 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 489
645 signal (SIGHUP, SIG_IGN); 490 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 491 signal (SIGPIPE, SIG_IGN);
647 492
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 493 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
650 sig_handlers.sw_int.start (SIGINT); 494 sig_handlers.sw_int.start (SIGINT); ev_unref ();
651 495
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 497 /* signal (SIGURG, SIG_DFL); */
654 498
655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
657 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
658 502
659 XrmInitialize (); 503 XrmInitialize ();
660} 504}
661 505
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/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
749/* 507/*
750 * window size/position calculcations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
751 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
752 */ 510 */
753void 511void
754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
755{ 513{
756 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
757 int x, y, sb_w, flags; 515 int x, y, flags;
758 unsigned int w, h; 516 unsigned int w, h;
759 unsigned int max_width, max_height; 517 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 518
765 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
766 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
767 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 521 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768 522
… …
776 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
777 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
778 532
779 if (flags & WidthValue) 533 if (flags & WidthValue)
780 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
781 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
782 szHint.flags |= USSize; 539 szHint.flags |= USSize;
783 } 540 }
784 541
785 if (flags & HeightValue) 542 if (flags & HeightValue)
786 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
787 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
788 szHint.flags |= USSize; 548 szHint.flags |= USSize;
789 } 549 }
790 550
791 if (flags & XValue) 551 if (flags & XValue)
792 { 552 {
… …
823 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
824 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
825 585
826 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
827 587
828 sb_w = 0;
829 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
830 589
831 if (scrollBar.state) 590 if (scrollBar.state)
832 { 591 {
833 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
834 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
594
835 if (!OPTION (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
836 window_vt_x += sb_w; 596 window_vt_x += sb_w;
837 } 597 }
838 598
839 szHint.width_inc = fwidth; 599 szHint.width_inc = fwidth;
840 szHint.height_inc = fheight; 600 szHint.height_inc = fheight;
841 szHint.min_width = szHint.base_width + szHint.width_inc; 601 szHint.min_width = szHint.base_width + szHint.width_inc;
842 szHint.min_height = szHint.base_height + szHint.height_inc; 602 szHint.min_height = szHint.base_height + szHint.height_inc;
843 603
844 if (newwidth && newwidth - szHint.base_width < max_width) 604 if (newwidth && newwidth - szHint.base_width < max_width)
845 { 605 {
846 szHint.width = newwidth; 606 szHint.width = newwidth;
… …
861 { 621 {
862 min_it (height, max_height); 622 min_it (height, max_height);
863 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
864 } 624 }
865 625
866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
867 window_sb_x = szHint.width - sb_w;
868
869 if (recalc_x) 626 if (recalc_x)
870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
628
871 if (recalc_y) 629 if (recalc_y)
872 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
873 631
874 ncol = width / fwidth; 632 ncol = width / fwidth;
875 nrow = height / fheight; 633 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} 634}
881 635
882/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
883/* 637/*
884 * Tell the teletype handler what size the window is. 638 * Tell the teletype handler what size the window is.
… …
894 648
895 ws.ws_col = ncol; 649 ws.ws_col = ncol;
896 ws.ws_row = nrow; 650 ws.ws_row = nrow;
897 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
898 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
900 654
901#if 0 655#if 0
902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
903 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
904 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
905#endif 659#endif
906} 660}
907 661
… …
934#endif 688#endif
935 689
936 delete fontset[0]; 690 delete fontset[0];
937 fontset[0] = fs; 691 fontset[0] = fs;
938 692
939 prop = (*fs)[1]->properties (); 693 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
940 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
696
941 fs->set_prop (prop); 697 fs->set_prop (prop, false);
942 698
943 fwidth = prop.width; 699 fwidth = prop.width;
944 fheight = prop.height; 700 fheight = prop.height;
945 fbase = prop.ascent; 701 fbase = prop.ascent;
946 702
… …
955 { 711 {
956 fontset[style] = fs = new rxvt_fontset (this); 712 fontset[style] = fs = new rxvt_fontset (this);
957 rxvt_fontprop prop2 = prop; 713 rxvt_fontprop prop2 = prop;
958 714
959 if (res) 715 if (res)
960 prop2.weight = prop2.slant = rxvt_fontprop::unset; 716 {
717 fs->populate (res);
718 fs->set_prop (prop2, false);
719 }
961 else 720 else
962 { 721 {
963 res = fontset[0]->fontdesc; 722 fs->populate (fontset[0]->fontdesc);
964 723
965 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;
966 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);
967 } 728 }
968 729
969 fs->populate (res);
970 fs->set_prop (prop2);
971 } 730 }
972#else 731#else
973 fontset[style] = fontset[0]; 732 fontset[style] = fontset[0];
974#endif 733#endif
975 } 734 }
… …
977 if (parent[0]) 736 if (parent[0])
978 { 737 {
979 resize_all_windows (0, 0, 0); 738 resize_all_windows (0, 0, 0);
980 scr_remap_chars (); 739 scr_remap_chars ();
981 scr_touch (true); 740 scr_touch (true);
982 } 741 }
983 742
984 return true; 743 return true;
985} 744}
986 745
746void
987void rxvt_term::set_string_property (Atom prop, const char *str, int len) 747rxvt_term::set_string_property (Atom prop, const char *str, int len)
988{ 748{
989 XChangeProperty (display->display, parent[0], 749 XChangeProperty (dpy, parent[0],
990 prop, XA_STRING, 8, PropModeReplace, 750 prop, XA_STRING, 8, PropModeReplace,
991 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 751 (const unsigned char *)str, len >= 0 ? len : strlen (str));
992} 752}
993 753
754void
994void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 755rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
995{ 756{
996 wchar_t *ws = rxvt_mbstowcs (str, len); 757 wchar_t *ws = rxvt_mbstowcs (str, len);
997 char *s = rxvt_wcstoutf8 (ws); 758 char *s = rxvt_wcstoutf8 (ws);
998 759
999 XChangeProperty (display->display, parent[0], 760 XChangeProperty (dpy, parent[0],
1000 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 761 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1001 (const unsigned char *)s, strlen (s)); 762 (const unsigned char *)s, strlen (s));
1002 763
1003 free (s); 764 free (s);
1004 free (ws); 765 free (ws);
… …
1023#if ENABLE_EWMH 784#if ENABLE_EWMH
1024 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
1025#endif 786#endif
1026} 787}
1027 788
789void
790rxvt_term::set_window_color (int idx, const char *color)
791{
1028#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
1029void
1030rxvt_term::set_window_color (int idx, const char *color)
1031{
1032 rxvt_color xcol; 793 rxvt_color xcol;
1033 int i;
1034 794
1035 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
1036 return; 796 return;
1037 797
798 color = strdup (color);
799 allocated.push_back ((void *)color);
800 rs[Rs_color + idx] = color;
801
1038 /* handle color aliases */ 802 /* handle color aliases */
1039 if (isdigit (*color)) 803 if (isdigit (*color))
1040 { 804 {
1041 i = atoi (color); 805 int i = atoi (color);
1042 806
1043 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
808 {
1044 { /* bright colors */ 809 /* bright colors */
1045 i -= 8;
1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1047 SET_PIXCOLOR (idx);
1048 goto done; 811 goto done;
1049 } 812 }
1050 813
1051 if (i >= 0 && i <= 7) 814 if (i >= 0 && i <= 7)
815 {
1052 { /* normal colors */ 816 /* normal colors */
1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 817 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1054 SET_PIXCOLOR (idx);
1055 goto done; 818 goto done;
1056 } 819 }
1057 } 820 }
1058 821
1059 if (!rXParseAllocColor (&xcol, color)) 822 set_color (xcol, color);
1060 return;
1061
1062 /* XStoreColor (display->display, display->cmap, XColor*); */
1063 823
1064 /* 824 /*
1065 * 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,
1066 * so just keep gobbling up the colormap 826 * so just keep gobbling up the colormap
1067 */ 827 */
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 828
1080 pix_colors_focused[idx] = xcol; 829 pix_colors_focused[idx] = xcol;
1081 SET_PIXCOLOR (idx);
1082 830
1083 /* XSetWindowAttributes attr; */
1084 /* Cursor cursor; */
1085done: 831done:
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. */ 832 /*TODO: handle Color_BD, scrollbar background, etc. */
1093 833
834 update_fade_color (idx);
1094 recolour_cursor (); 835 recolour_cursor ();
1095 scr_recolour (); 836 scr_recolour ();
837#endif /* XTERM_COLOR_CHANGE */
1096} 838}
1097
1098#else
1099# define set_window_color (idx,color) ((void)0)
1100#endif /* XTERM_COLOR_CHANGE */
1101 839
1102void 840void
1103rxvt_term::recolour_cursor () 841rxvt_term::recolour_cursor ()
1104{ 842{
1105 XColor xcol[2]; 843 XColor fg, bg;
1106 844
1107 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 845 (ISSET_PIXCOLOR (Color_pointer_fg)
1108 ? pix_colors_focused[Color_pointer_fg] 846 ? pix_colors_focused[Color_pointer_fg]
1109 : pix_colors_focused[Color_fg]; 847 : pix_colors_focused[Color_fg]).get (fg);
848
1110 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 849 (ISSET_PIXCOLOR (Color_pointer_bg)
1111 ? pix_colors_focused[Color_pointer_bg] 850 ? pix_colors_focused[Color_pointer_bg]
1112 : pix_colors_focused[Color_bg]; 851 : pix_colors_focused[Color_bg]).get (bg);
1113 852
1114 XQueryColors (display->display, display->cmap, xcol, 2); 853 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1115 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1116} 854}
1117 855
1118/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
1119/* 857/*
1120 * 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
1121 */ 859 */
1122void 860void
1123rxvt_term::set_colorfgbg () 861rxvt_term::set_colorfgbg ()
1124{ 862{
1125 unsigned int i; 863 unsigned int i;
1126 const char *xpmb = "\0"; 864 const char *xpmb = "";
1127 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1128 866
1129 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1130 strcpy (fstr, "default"); 867 strcpy (fstr, "default");
1131 strcpy (bstr, "default"); 868 strcpy (bstr, "default");
1132 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
1133 if (pix_colors[Color_fg] == pix_colors[i]) 870 if (pix_colors[Color_fg] == pix_colors[i])
1134 { 871 {
… …
1138 875
1139 for (i = Color_Black; i <= Color_White; i++) 876 for (i = Color_Black; i <= Color_White; i++)
1140 if (pix_colors[Color_bg] == pix_colors[i]) 877 if (pix_colors[Color_bg] == pix_colors[i])
1141 { 878 {
1142 sprintf (bstr, "%d", (i - Color_Black)); 879 sprintf (bstr, "%d", (i - Color_Black));
1143#ifdef XPM_BACKGROUND 880#ifdef BG_IMAGE_FROM_FILE
1144 xpmb = "default;"; 881 xpmb = "default;";
1145#endif 882#endif
1146 break; 883 break;
1147 } 884 }
1148 885
1149 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 886 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1150} 887}
1151 888
1152/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
1153 890
1154int 891bool
1155rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 892rxvt_term::set_color (rxvt_color &color, const char *name)
1156{ 893{
1157 if (!screen_in_out->set (display, colour)) 894 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; 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]);
1164} 905}
1165 906
1166/* -------------------------------------------------------------------- * 907/* -------------------------------------------------------------------- *
1167 * - WINDOW RESIZING - * 908 * - WINDOW RESIZING - *
1168 * -------------------------------------------------------------------- */ 909 * -------------------------------------------------------------------- */
1169void 910void
1170rxvt_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)
1171{ 912{
1172 int fix_screen; 913 int fix_screen;
1173 int old_width = szHint.width, old_height = szHint.height; 914 int old_width = szHint.width;
1174 dDisp; 915 int old_height = szHint.height;
1175 916
1176 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);
1177 XSetWMNormalHints (disp, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1178 928
1179 if (!ignoreparent) 929 if (!ignoreparent)
1180 { 930 {
1181#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1182 /* 932 /*
… …
1186 int x, y, x1, y1; 936 int x, y, x1, y1;
1187 int dx, dy; 937 int dx, dy;
1188 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 938 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1189 Window unused_cr; 939 Window unused_cr;
1190 940
1191 XTranslateCoordinates (disp, parent[0], display->root, 941 XTranslateCoordinates (dpy, parent[0], display->root,
1192 0, 0, &x, &y, &unused_cr); 942 0, 0, &x, &y, &unused_cr);
1193 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 943 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1194 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 944 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1195 /* 945 /*
1196 * 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
1197 * our position for handles and decorations. Counter it 947 * our position for handles and decorations. Counter it
1198 */ 948 */
… …
1200 { 950 {
1201 x -= x1; 951 x -= x1;
1202 y -= y1; 952 y -= y1;
1203 } 953 }
1204 954
1205 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 955 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1206 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 956 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1207 dx = old_width - szHint.width; 957 dx = old_width - szHint.width;
1208 dy = old_height - szHint.height; 958 dy = old_height - szHint.height;
1209 959
1210 /* Check position of the center of the window */ 960 /* Check position of the center of the window */
1211 if (x < x1) /* left half */ 961 if (x < x1) /* left half */
1212 dx = 0; 962 dx = 0;
… …
1215 if (y < y1) /* top half */ 965 if (y < y1) /* top half */
1216 dy = 0; 966 dy = 0;
1217 else if (y == y1) /* exact center */ 967 else if (y == y1) /* exact center */
1218 dy /= 2; 968 dy /= 2;
1219 969
1220 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 970 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1221 szHint.width, szHint.height); 971 szHint.width, szHint.height);
1222#else 972#else
1223 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1224#endif 974#endif
1225 } 975 }
976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
1226 979
1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1228 981
1229 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1230 { 983 {
1231 if (scrollBar.state) 984 if (scrollBar.state)
1232 { 985 scrollBar.resize ();
1233 XMoveResizeWindow (disp, scrollBar.win,
1234 window_sb_x, 0,
1235 scrollbar_TotalWidth (), szHint.height);
1236 resize_scrollbar ();
1237 }
1238 986
1239 XMoveResizeWindow (disp, vt, 987 XMoveResizeWindow (dpy, vt,
1240 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1241 width, height); 989 width, height);
1242 990
1243 scr_clear (); 991#ifdef HAVE_BG_PIXMAP
1244#ifdef XPM_BACKGROUND 992 if (bgPixmap.window_size_sensitive ())
1245 resize_pixmap (); 993 update_background ();
1246#endif 994#endif
1247 } 995 }
1248 996
1249 if (fix_screen || old_height == 0) 997 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 (); 998 scr_reset ();
1264 999
1265 if (curr_screen >= 0) /* this is not the first time through */ 1000#ifdef HAVE_BG_PIXMAP
1266 { 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1267 scr_change_screen (curr_screen); 1002// if (bgPixmap.pixmap)
1268 selection_check (old_ncol != ncol ? 4 : 0);
1269 }
1270 }
1271
1272 old_width = szHint.width;
1273 old_height = szHint.height;
1274
1275#ifdef XPM_BACKGROUND
1276 if (pixmap)
1277 scr_touch (false); 1003// scr_touch (false);
1278#endif 1004#endif
1279 1005
1280#ifdef USE_XIM 1006#ifdef USE_XIM
1281 IMSetStatusPosition (); 1007 IMSetPosition ();
1282#endif 1008#endif
1283} 1009}
1284 1010
1285/* 1011/*
1286 * 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.
… …
1291{ 1017{
1292 XWindowAttributes wattr; 1018 XWindowAttributes wattr;
1293 1019
1294 if (newwidth == 0 || newheight == 0) 1020 if (newwidth == 0 || newheight == 0)
1295 { 1021 {
1296 XGetWindowAttributes (display->display, display->root, &wattr); 1022 XGetWindowAttributes (dpy, display->root, &wattr);
1297 1023
1298 if (newwidth == 0) 1024 if (newwidth == 0)
1299 newwidth = wattr.width - szHint.base_width; 1025 newwidth = wattr.width - szHint.base_width;
1300 if (newheight == 0) 1026 if (newheight == 0)
1301 newheight = wattr.height - szHint.base_height; 1027 newheight = wattr.height - szHint.base_height;
… …
1315#ifdef USE_XIM 1041#ifdef USE_XIM
1316 1042
1317void 1043void
1318rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1319{ 1045{
1320 fg = pix_colors[Color_fg]; 1046 fg = pix_colors [Color_fg];
1321 bg = pix_colors[Color_bg]; 1047 bg = pix_colors [Color_bg];
1322} 1048}
1323 1049
1324void 1050void
1325rxvt_term::im_set_size (XRectangle &size) 1051rxvt_term::im_set_size (XRectangle &size)
1326{ 1052{
… …
1349 1075
1350/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1351bool 1077bool
1352rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1353{ 1079{
1354 char *p;
1355 Atom atom; 1080 Atom atom;
1356 Window win; 1081 Window win;
1357 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1358 1083
1359 /* get current locale modifier */ 1084 /* get current locale modifier */
1360 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1361 { 1086 {
1362 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1363 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1364 1089
1365 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1366 *p = '\0'; 1091 *p = '\0';
1367 1092
1368 atom = XInternAtom (display->display, server, False); 1093 atom = XInternAtom (dpy, server, False);
1369 win = XGetSelectionOwner (display->display, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1370 1095
1371 if (win != None) 1096 if (win != None)
1372 return True; 1097 return True;
1373 } 1098 }
1374 1099
… …
1381 XPoint nspot; 1106 XPoint nspot;
1382 XVaNestedList preedit_attr; 1107 XVaNestedList preedit_attr;
1383 1108
1384 if (!Input_Context 1109 if (!Input_Context
1385 || !focus 1110 || !focus
1386 || !(input_style & XIMPreeditPosition)) 1111 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1387 return; 1112 return;
1388 1113
1389 im_set_position (nspot); 1114 im_set_position (nspot);
1390 1115
1391 if (nspot.x == spot.x && nspot.y == spot.y) 1116 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1410 input_method = 0; 1135 input_method = 0;
1411 } 1136 }
1412 1137
1413 Input_Context = 0; 1138 Input_Context = 0;
1414} 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
1415 1214
1416/* 1215/*
1417 * 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
1418 * open a suitable preedit type 1217 * open a suitable preedit type
1419 */ 1218 */
… …
1426 XRectangle rect, status_rect, needed_rect; 1225 XRectangle rect, status_rect, needed_rect;
1427 unsigned long fg, bg; 1226 unsigned long fg, bg;
1428 const char *p; 1227 const char *p;
1429 char **s; 1228 char **s;
1430 XIMStyles *xim_styles; 1229 XIMStyles *xim_styles;
1230#ifdef ENABLE_XIM_ONTHESPOT
1231 XIMCallback xcb[4];
1232#endif
1431 1233
1432 set_environ (envv); 1234 set_environ (envv);
1433 1235
1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1236 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435 return false; 1237 return false;
1436 1238
1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438 input_method = display->get_xim (locale, modifiers); 1239 input_method = display->get_xim (locale, modifiers);
1439 if (input_method == NULL) 1240 if (input_method == NULL)
1440 return false; 1241 return false;
1441 1242
1442 xim = input_method->xim; 1243 xim = input_method->xim;
… …
1462 s = rxvt_splitcommastring (p); 1263 s = rxvt_splitcommastring (p);
1463 1264
1464 for (i = found = 0; !found && s[i]; i++) 1265 for (i = found = 0; !found && s[i]; i++)
1465 { 1266 {
1466 if (!strcmp (s[i], "OverTheSpot")) 1267 if (!strcmp (s[i], "OverTheSpot"))
1467 input_style = (XIMPreeditPosition | XIMStatusNothing); 1268 input_style = XIMPreeditPosition | XIMStatusNothing;
1468 else if (!strcmp (s[i], "OffTheSpot")) 1269 else if (!strcmp (s[i], "OffTheSpot"))
1469 input_style = (XIMPreeditArea | XIMStatusArea); 1270 input_style = XIMPreeditArea | XIMStatusArea;
1470 else if (!strcmp (s[i], "Root")) 1271 else if (!strcmp (s[i], "Root"))
1471 input_style = (XIMPreeditNothing | XIMStatusNothing); 1272 input_style = XIMPreeditNothing | XIMStatusNothing;
1472 else if (!strcmp (s[i], "None")) 1273 else if (!strcmp (s[i], "None"))
1473 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;
1474 1281
1475 for (j = 0; j < xim_styles->count_styles; j++) 1282 for (j = 0; j < xim_styles->count_styles; j++)
1476 if (input_style == xim_styles->supported_styles[j]) 1283 if (input_style == xim_styles->supported_styles[j])
1477 { 1284 {
1478 rxvt_freecommastring (s); 1285 rxvt_freecommastring (s);
… …
1516 "*", 1323 "*",
1517 fheight, 1324 fheight,
1518 fheight + 1, fheight - 1, 1325 fheight + 1, fheight - 1,
1519 fheight - 2, fheight + 2); 1326 fheight - 2, fheight + 2);
1520 1327
1521 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1328 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1522 &missing_charset_list, &missing_charset_count, &def_string); 1329 &missing_charset_list, &missing_charset_count, &def_string);
1523 1330
1524 if (missing_charset_list) 1331 if (missing_charset_list)
1525 XFreeStringList (missing_charset_list); 1332 XFreeStringList (missing_charset_list);
1526 1333
… …
1567 XNBackground, bg, 1374 XNBackground, bg,
1568 XNArea, &status_rect, 1375 XNArea, &status_rect,
1569 XNFontSet, fs, 1376 XNFontSet, fs,
1570 NULL); 1377 NULL);
1571 } 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
1572 1402
1573 Input_Context = XCreateIC (xim, 1403 Input_Context = XCreateIC (xim,
1574 XNInputStyle, input_style, 1404 XNInputStyle, input_style,
1575 XNClientWindow, vt, 1405 XNClientWindow, vt,
1576 XNFocusWindow, parent[0], 1406 XNFocusWindow, parent[0],
… …
1578 preedit_attr, 1408 preedit_attr,
1579 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1580 status_attr, NULL); 1410 status_attr, NULL);
1581 1411
1582 if (preedit_attr) XFree (preedit_attr); 1412 if (preedit_attr) XFree (preedit_attr);
1583 if (status_attr) XFree (status_attr); 1413 if (status_attr) XFree (status_attr);
1584 if (fs) XFreeFontSet (display->display, fs); 1414 if (fs) XFreeFontSet (dpy, fs);
1585 1415
1586 if (Input_Context == NULL) 1416 if (Input_Context == NULL)
1587 { 1417 {
1588 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589 im_destroy (); 1419 im_destroy ();
1590 return false; 1420 return false;
1591 } 1421 }
1592 1422
1593 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
1594 IMSetStatusPosition (); 1429 IMSetPosition ();
1595 1430
1596 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597 return true; 1431 return true;
1598} 1432}
1599 1433
1600void 1434void
1601rxvt_term::im_cb () 1435rxvt_term::im_cb ()
… …
1607 1441
1608 make_current (); 1442 make_current ();
1609 1443
1610 im_destroy (); 1444 im_destroy ();
1611 1445
1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613 if (Input_Context) 1446 if (Input_Context)
1614 return; 1447 return;
1615 1448
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1449#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale]) 1450 if (rs[Rs_imLocale])
… …
1659 SET_LOCALE (locale); 1492 SET_LOCALE (locale);
1660#endif 1493#endif
1661} 1494}
1662 1495
1663void 1496void
1664rxvt_term::IMSetStatusPosition () 1497rxvt_term::IMSetPosition ()
1665{ 1498{
1666 XRectangle preedit_rect, status_rect, *needed_rect; 1499 XRectangle preedit_rect, status_rect, *needed_rect;
1667 XVaNestedList preedit_attr, status_attr; 1500 XVaNestedList preedit_attr, status_attr;
1668 1501
1669 if (!Input_Context 1502 if (!Input_Context
1670 || !focus 1503 || !focus
1671 || !(input_style & XIMPreeditArea) 1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1672 || !IMisRunning ()) 1505 || !IMisRunning ())
1673 return; 1506 return;
1674 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 {
1675 /* Getting the necessary width of preedit area */ 1518 /* Getting the necessary width of preedit area */
1676 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1519 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1677 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1520 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1678 XFree (status_attr); 1521 XFree (status_attr);
1679 1522
1680 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1523 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1681 XFree (needed_rect); 1524 XFree (needed_rect);
1682 1525
1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1526 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1684 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1527 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1685 1528
1686 XSetICValues (Input_Context, 1529 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, 1530 XNPreeditAttributes, preedit_attr,
1688 XNStatusAttributes, status_attr, NULL); 1531 XNStatusAttributes, status_attr,
1532 NULL);
1689 1533
1534 XFree (status_attr);
1535 }
1536
1690 XFree (preedit_attr); 1537 XFree (preedit_attr);
1691 XFree (status_attr);
1692} 1538}
1693#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1694 1540
1695/*----------------------------------------------------------------------*/ 1541void
1696rxvt_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 */
1697 1607
1698/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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