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

Diff Legend

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