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

Diff Legend

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