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

Diff Legend

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