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.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.268 by root, Tue Nov 27 17:52:51 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
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
58// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term;
60
53static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
54 62
55bool 63bool
56rxvt_set_locale (const char *locale) 64rxvt_set_locale (const char *locale) NOTHROW
57{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
58 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 72 return false;
60 73
61 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
63 return true; 76 return true;
64} 77}
65 78
66bool 79void
67rxvt_push_locale (const char *locale) 80rxvt_push_locale (const char *locale) NOTHROW
68{ 81{
69 strcpy (savelocale, curlocale); 82 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 83 rxvt_set_locale (locale);
71} 84}
72 85
73void 86void
74rxvt_pop_locale () 87rxvt_pop_locale () NOTHROW
75{ 88{
76 rxvt_set_locale (savelocale); 89 rxvt_set_locale (savelocale);
77} 90}
78 91
79#if ENABLE_COMBINING 92#if ENABLE_COMBINING
80class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
81 94
82text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
83{ 96{
84 compose_char *cc; 97 compose_char *cc;
85 98
86 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
87 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
88 cc = (*this)[c1]; 101 cc = (*this)[c1];
89 while (cc) 102 while (cc)
90 { 103 {
… …
140} 153}
141#endif 154#endif
142 155
143rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
144 : 157 :
145#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
146 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),
147#endif 163#endif
148#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 166#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 169#endif
157#ifdef TEXT_BLINK 170#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 171 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 184#endif
172#ifdef USE_XIM 185#ifdef USE_XIM
173 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),
174#endif 190#endif
175 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
177 check_ev (this, &rxvt_term::check_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
182{ 199{
183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184 201
185 termlist.push_back (this); 202 termlist.push_back (this);
186 203
187#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 205 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 206#endif
193} 207}
194 208
195// 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.
196// for use before an emergency exit 210// for use before an emergency exit
211void
197void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
198{ 213{
199 if (cmd_pid) 214 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
201 216
202#ifdef UTMP_SUPPORT 217 pty_ev.stop ();
203 privileged_utmp (RESTORE); 218 delete pty; pty = 0;
204#endif
205
206 pty.put ();
207} 219}
208 220
209rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
210{ 222{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 223 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 224
215 emergency_cleanup (); 225 emergency_cleanup ();
216 226
217#if ENABLE_STYLES 227#if ENABLE_STYLES
… …
221#endif 231#endif
222 delete fontset[0]; 232 delete fontset[0];
223 233
224 if (display) 234 if (display)
225 { 235 {
226 dDisp;
227
228 selection_clear (); 236 selection_clear ();
229 237
230#ifdef USE_XIM 238#ifdef USE_XIM
231 im_destroy (); 239 im_destroy ();
232#endif 240#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif
236#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
239#endif 244#endif
240#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
242#endif 247#endif
243#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
244 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
245 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
246 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
247 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
248 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
249 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
250 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
254#endif 259#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
259#endif 264#endif
260 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (dpy, gc);
261 266
262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263 delete menuBar.drawable;
264 //if (menuBar.win)
265 // XDestroyWindow (disp, menuBar.win);
266#endif
267 delete drawable; 267 delete drawable;
268 // destroy all windows 268 // destroy all windows
269 if (parent[0]) 269 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
271 }
272 271
273 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
274 273 if (ISSET_PIXCOLOR (i))
275 delete pix_colors_focused; 274 {
275 pix_colors_focused [i].free (this);
276#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
277 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
278#endif 287#endif
279 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
280 displays.put (display); 292 displays.put (display);
281 293
282 scr_release (); 294 scr_release ();
283 295
284 /* clear all resources */ 296 /* clear all resources */
285 for (int i = 0; i < allocated.size (); i++) 297 for (int i = 0; i < allocated.size (); i++)
286 free (allocated [i]); 298 free (allocated [i]);
287 299
288 free (selection.text); 300 free (selection.text);
289 // TODO: manage env vars in child only(!) 301 // TODO: manage env vars in child only(!)
290 free (env_windowid);
291 free (env_display); 302 free (env_display);
292 free (env_term); 303 free (env_term);
293 free (env_colorfgbg);
294 free (locale); 304 free (locale);
295 free (v_buffer); 305 free (v_buffer);
296 free (incr_buf); 306 free (incr_buf);
297 307
298 delete envv; 308 delete envv;
299 delete argv; 309 delete argv;
300 310
301#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
302 delete keyboard; 312 delete keyboard;
303#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
304} 317}
305 318
319// child has exited, usually destroys
306void 320void
307rxvt_term::child_exit () 321rxvt_term::child_cb (ev::child &w, int status)
308{ 322{
323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
324
309 cmd_pid = 0; 325 cmd_pid = 0;
310 326
311 if (!OPTION (Opt_hold)) 327 if (!option (Opt_hold))
312 destroy (); 328 destroy ();
313} 329}
314 330
315void 331void
316rxvt_term::destroy () 332rxvt_term::destroy ()
317{ 333{
318 if (destroy_ev.active) 334 if (destroy_ev.active)
319 return; 335 return;
320 336
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338
321#if ENABLE_OVERLAY 339#if ENABLE_OVERLAY
322 scr_overlay_off (); 340 scr_overlay_off ();
323#endif 341#endif
324 342
325 if (display) 343 if (display)
… …
328 im_ev.stop (display); 346 im_ev.stop (display);
329#endif 347#endif
330#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
332#endif 350#endif
333#if MENUBAR 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT
337 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
338#endif 353#endif
339 incr_ev.stop (); 354 incr_ev.stop ();
340 termwin_ev.stop (display); 355 termwin_ev.stop (display);
341 vt_ev.stop (display); 356 vt_ev.stop (display);
342 } 357 }
343 358
344 check_ev.stop (); 359 prepare_ev.stop ();
345 pty_ev.stop (); 360 pty_ev.stop ();
346#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
348#endif 363#endif
349#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
357#endif 372#endif
358#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
359 pointer_ev.stop (); 374 pointer_ev.stop ();
360#endif 375#endif
361 376
362 destroy_ev.start (0); 377 destroy_ev.start ();
363} 378}
364 379
365void 380void
366rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 382{
368 SET_R (this); 383 make_current ();
369 384
370 delete this; 385 delete this;
371} 386}
372 387
373/*----------------------------------------------------------------------*/ 388/*----------------------------------------------------------------------*/
… …
382{ 397{
383 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++)
384 (*t)->emergency_cleanup (); 399 (*t)->emergency_cleanup ();
385} 400}
386 401
387#if ENABLE_FRILLS 402#if !ENABLE_MINIMAL
388static void 403static void
389print_x_error (Display *dpy, XErrorEvent *event) 404print_x_error (Display *dpy, XErrorEvent *event)
390{ 405{
391 char buffer[BUFSIZ]; 406 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 407 char mesg[BUFSIZ];
… …
425 else 440 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 442 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 444 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 446 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 448}
434#endif 449#endif
435 450
… …
440 GET_R->allowedxerror = event->error_code; 455 GET_R->allowedxerror = event->error_code;
441 else 456 else
442 { 457 {
443 // 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,
444 // so just output the error and continue 459 // so just output the error and continue
445#if ENABLE_FRILLS 460#if ENABLE_MINIMAL
461 old_xerror_handler (display, event);
462#else
446 print_x_error (display, event); 463 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 464#endif
450 } 465 }
451 466
452 return 0; 467 return 0;
453} 468}
… …
461 _exit (EXIT_FAILURE); 476 _exit (EXIT_FAILURE);
462} 477}
463 478
464/*----------------------------------------------------------------------*/ 479/*----------------------------------------------------------------------*/
465bool 480bool
466rxvt_term::init (int argc, const char *const *argv) 481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 482{
483 this->envv = envv;
484
468 SET_R (this); 485 SET_R (this);
469
470 set_locale (""); 486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
471 488
472 if (!init_vars ()) 489 if (!init_vars ())
473 return false; 490 return false;
474 491
475 init_secondary (); 492 init_secondary ();
… …
478 495
479#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 497 keyboard->register_done ();
481#endif 498#endif
482 499
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 503#endif
490 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
491#if ENABLE_PERL 565#if ENABLE_PERL
492 if (!rs[Rs_perl_ext_1])
493 rs[Rs_perl_ext_1] = "default";
494
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_perl.init ();
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 }
502#endif
503
504 create_windows (argc, argv);
505
506 dDisp;
507
508 init_xlocale ();
509
510 scr_reset (); /* initialize screen */
511
512#if 0
513 XSynchronize (disp, True);
514#endif
515
516#ifdef HAVE_SCROLLBARS
517 if (OPTION (Opt_scrollBar))
518 resize_scrollbar (); /* create and map scrollbar */
519#endif
520#if (MENUBAR_MAX)
521 if (menubar_visible ())
522 XMapWindow (disp, menuBar.win);
523#endif
524#ifdef TRANSPARENT
525 if (OPTION (Opt_transparent))
526 {
527 XSelectInput (disp, display->root, PropertyChangeMask);
528 check_our_parents ();
529 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
530 }
531#endif 567#endif
532
533 XMapWindow (disp, vt);
534 XMapWindow (disp, parent[0]);
535 568
536 set_colorfgbg (); 569 set_colorfgbg ();
537 570
538 init_command (cmd_argv); 571 init_command (cmd_argv);
539 572
540 free (cmd_argv); 573 free (cmd_argv);
541 574
542 if (pty.pty >= 0) 575 if (pty->pty >= 0)
543 pty_ev.start (pty.pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
544 577
545 check_ev.start (); 578 prepare_ev.start ();
546 579
547 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
548 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
549 return true; 595 return true;
550} 596}
551 597
552static struct sig_handlers 598static struct sig_handlers
553{ 599{
554 sig_watcher sw_chld, sw_term, sw_int; 600 ev::sig sw_term, sw_int;
555
556 void sig_chld (sig_watcher &w)
557 {
558 // we are being called for every SIGCHLD, find the corresponding term
559 int pid;
560
561 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
562 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
563 if (pid == (*t)->cmd_pid)
564 {
565 (*t)->child_exit ();
566 break;
567 }
568 }
569 601
570 /* 602 /*
571 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
572 */ 604 */
573 void 605 void
574 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
575 { 607 {
576#ifdef DEBUG_CMD
577 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
578#endif
579 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
580 signal (w.signum, SIG_DFL); 609 w.stop ();
581 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
582 } 611 }
583 612
584 sig_handlers () 613 sig_handlers ()
585 : sw_chld (this, &sig_handlers::sig_chld),
586 sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
587 sw_int (this, &sig_handlers::sig_term) 615 sw_int (this, &sig_handlers::sig_term)
588 { 616 {
589 } 617 }
590} sig_handlers; 618} sig_handlers;
591 619
620char **rxvt_environ; // startup environment
621
592void 622void
593rxvt_init () 623rxvt_init ()
594{ 624{
595 /* 625 ptytty::init ();
596 * Save and then give up any super-user privileges 626
597 * If we need privileges in any area then we must specifically request it. 627 if (!ev_default_loop (0))
598 * We should only need to be root in these cases: 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
599 * 1. write utmp entries on some systems 629
600 * 2. chown tty on some systems 630 rxvt_environ = environ;
601 */
602 rxvt_privileges (SAVE);
603 rxvt_privileges (IGNORE);
604 631
605 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
606 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
607 634
608 sig_handlers.sw_chld.start (SIGCHLD);
609 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
610 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
611 637
612 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
613 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
614 640
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 642 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 643 XSetIOErrorHandler (rxvt_xioerror_handler);
644
645 XrmInitialize ();
618} 646}
619 647
620/* ------------------------------------------------------------------------- * 648/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 649 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 650 * ------------------------------------------------------------------------- */
… …
640 rxvt_fatal ("memory allocation failure. aborting.\n"); 668 rxvt_fatal ("memory allocation failure. aborting.\n");
641 669
642 return p; 670 return p;
643} 671}
644 672
645void * 673void *
646rxvt_realloc (void *ptr, size_t size) 674rxvt_realloc (void *ptr, size_t size)
647{ 675{
648 void *p = realloc (ptr, size); 676 void *p = realloc (ptr, size);
649 677
650 if (!p) 678 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n"); 679 rxvt_fatal ("memory allocation failure. aborting.\n");
652 680
653 return p; 681 return p;
654} 682}
655 683
656/* ------------------------------------------------------------------------- *
657 * PRIVILEGED OPERATIONS *
658 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */
660void
661rxvt_privileges (rxvt_privaction action)
662{
663#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664 static uid_t euid;
665 static gid_t egid;
666#endif
667
668#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a))
673# define HAVE_SETEUID
674# endif
675# ifdef HAVE_SETEUID
676 switch (action)
677 {
678 case IGNORE:
679 /*
680 * change effective uid/gid - not real uid/gid - so we can switch
681 * back to root later, as required
682 */
683 seteuid (getuid ());
684 setegid (getgid ());
685 break;
686 case SAVE:
687 euid = geteuid ();
688 egid = getegid ();
689 break;
690 case RESTORE:
691 seteuid (euid);
692 setegid (egid);
693 break;
694 }
695# else
696 switch (action)
697 {
698 case IGNORE:
699 setuid (getuid ());
700 setgid (getgid ());
701 /* FALLTHROUGH */
702 case SAVE:
703 /* FALLTHROUGH */
704 case RESTORE:
705 break;
706 }
707# endif
708#endif
709}
710
711#ifdef UTMP_SUPPORT
712void
713rxvt_term::privileged_utmp (rxvt_privaction action)
714{
715 if (OPTION (Opt_utmpInhibit)
716 || !pty.name || !*pty.name)
717 return;
718
719 rxvt_privileges (RESTORE);
720
721 if (action == SAVE)
722 makeutent (pty.name, rs[Rs_display_name]);
723 else
724 cleanutent ();
725
726 rxvt_privileges (IGNORE);
727}
728#endif
729
730/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
731/* 685/*
732 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
733 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
734 */ 688 */
735void 689void
736rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737{ 691{
738 short recalc_x, recalc_y; 692 short recalc_x, recalc_y;
739 int x, y, sb_w, mb_h, flags; 693 int x, y, sb_w, flags;
740 unsigned int w, h; 694 unsigned int w, h;
741 unsigned int max_width, max_height; 695 unsigned int max_width, max_height;
742 dDisp;
743
744 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745 ncol, nrow, szHint.width, szHint.height));
746 696
747 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
748 szHint.win_gravity = NorthWestGravity; 698 szHint.win_gravity = NorthWestGravity;
749 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 699 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
750 700
… …
805 max_width = MAX_COLS * fwidth; 755 max_width = MAX_COLS * fwidth;
806 max_height = MAX_ROWS * fheight; 756 max_height = MAX_ROWS * fheight;
807 757
808 szHint.base_width = szHint.base_height = 2 * int_bwidth; 758 szHint.base_width = szHint.base_height = 2 * int_bwidth;
809 759
810 sb_w = mb_h = 0; 760 sb_w = 0;
811 window_vt_x = window_vt_y = int_bwidth; 761 window_vt_x = window_vt_y = int_bwidth;
812 762
813 if (scrollbar_visible ()) 763 if (scrollBar.state)
814 { 764 {
815 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
816 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
767
817 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
818 window_vt_x += sb_w; 769 window_vt_x += sb_w;
819 } 770 }
820 771
821 if (menubar_visible ())
822 {
823 mb_h = menuBar_TotalHeight ();
824 szHint.base_height += mb_h;
825 window_vt_y += mb_h;
826 }
827
828 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
832 776
833 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
834 { 778 {
835 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
850 { 794 {
851 min_it (height, max_height); 795 min_it (height, max_height);
852 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
853 } 797 }
854 798
855 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
857 801
858 if (recalc_x) 802 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804
860 if (recalc_y) 805 if (recalc_y)
861 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
862 807
863 ncol = width / fwidth; 808 ncol = width / fwidth;
864 nrow = height / fheight; 809 nrow = height / fheight;
865 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866 ncol, nrow, szHint.width,
867 szHint.height));
868 return;
869} 810}
870 811
871/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
872/* 813/*
873 * Tell the teletype handler what size the window is. 814 * Tell the teletype handler what size the window is.
874 * Called after a window size change. 815 * Called after a window size change.
875 */ 816 */
876void 817void
877rxvt_term::tt_winch () 818rxvt_term::tt_winch ()
878{ 819{
879 if (pty.pty < 0) 820 if (pty->pty < 0)
880 return; 821 return;
881 822
882 struct winsize ws; 823 struct winsize ws;
883 824
884 ws.ws_col = ncol; 825 ws.ws_col = ncol;
885 ws.ws_row = nrow; 826 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 827 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 828 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 830
890#if 0 831#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 833 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 834 kill (-cmd_pid, SIGWINCH);
… …
925 delete fontset[0]; 866 delete fontset[0];
926 fontset[0] = fs; 867 fontset[0] = fs;
927 868
928 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
929 prop.height += lineSpace; 870 prop.height += lineSpace;
871
930 fs->set_prop (prop); 872 fs->set_prop (prop, false);
931 873
932 fwidth = prop.width; 874 fwidth = prop.width;
933 fheight = prop.height; 875 fheight = prop.height;
934 fbase = prop.ascent; 876 fbase = prop.ascent;
935 877
… …
944 { 886 {
945 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
946 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
947 889
948 if (res) 890 if (res)
949 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
950 else 895 else
951 { 896 {
952 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
953 898
954 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;
955 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);
956 } 903 }
957 904
958 fs->populate (res);
959 fs->set_prop (prop2);
960 } 905 }
961#else 906#else
962 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
963#endif 908#endif
964 } 909 }
… …
966 if (parent[0]) 911 if (parent[0])
967 { 912 {
968 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
969 scr_remap_chars (); 914 scr_remap_chars ();
970 scr_touch (true); 915 scr_touch (true);
971 } 916 }
972 917
973 return true; 918 return true;
974} 919}
975 920
921void
976void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
977{ 923{
978 XChangeProperty (display->display, parent[0], 924 XChangeProperty (dpy, parent[0],
979 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
980 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
981} 927}
982 928
929void
983void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
984{ 931{
985 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
986 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
987 934
988 XChangeProperty (display->display, parent[0], 935 XChangeProperty (dpy, parent[0],
989 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
990 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
991 938
992 free (s); 939 free (s);
993 free (ws); 940 free (ws);
… …
1012#if ENABLE_EWMH 959#if ENABLE_EWMH
1013 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
1014#endif 961#endif
1015} 962}
1016 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
1017#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
1018void
1019rxvt_term::set_window_color (int idx, const char *color)
1020{
1021 rxvt_color xcol; 968 rxvt_color xcol;
1022 int i; 969 int i;
1023 970
1024 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
1025 return; 972 return;
1026 973
974 color = strdup (color);
975 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color;
977
1027 /* handle color aliases */ 978 /* handle color aliases */
1028 if (isdigit (*color)) 979 if (isdigit (*color))
1029 { 980 {
1030 i = atoi (color); 981 i = atoi (color);
1031 982
1032 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
1033 { /* bright colors */ 985 /* bright colors */
1034 i -= 8;
1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1036 SET_PIXCOLOR (idx);
1037 goto done; 987 goto done;
1038 } 988 }
1039 989
1040 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
1041 { /* normal colors */ 992 /* normal colors */
1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1043 SET_PIXCOLOR (idx);
1044 goto done; 994 goto done;
1045 } 995 }
1046 } 996 }
1047 997
1048 if (!rXParseAllocColor (&xcol, color)) 998 set_color (xcol, color);
1049 return;
1050
1051 /* XStoreColor (display->display, display->cmap, XColor*); */
1052 999
1053 /* 1000 /*
1054 * 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,
1055 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
1056 */ 1003 */
1057# if 0
1058 for (i = Color_Black; i <= Color_White; i++)
1059 if (pix_colors[idx] == pix_colors[i])
1060 break;
1061 if (i > Color_White)
1062 {
1063 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1064 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1065 DisplayPlanes (display->display, display->screen));
1066 }
1067# endif
1068 1004
1069 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
1070 SET_PIXCOLOR (idx);
1071 1006
1072 /* XSetWindowAttributes attr; */
1073 /* Cursor cursor; */
1074done: 1007done:
1075
1076#if OFF_FOCUS_FADING
1077 if (rs[Rs_fade])
1078 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1079#endif
1080
1081 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
1082 1009
1010 update_fade_color (idx);
1083 recolour_cursor (); 1011 recolour_cursor ();
1084 scr_recolour (); 1012 scr_recolour ();
1013#endif /* XTERM_COLOR_CHANGE */
1085} 1014}
1086
1087#else
1088# define set_window_color (idx,color) ((void)0)
1089#endif /* XTERM_COLOR_CHANGE */
1090 1015
1091void 1016void
1092rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
1093{ 1018{
1094 XColor xcol[2]; 1019 XColor fg, bg;
1095 1020
1096 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1021 (ISSET_PIXCOLOR (Color_pointer_fg)
1097 ? pix_colors_focused[Color_pointer_fg] 1022 ? pix_colors_focused[Color_pointer_fg]
1098 : pix_colors_focused[Color_fg]; 1023 : pix_colors_focused[Color_fg]).get (fg);
1024
1099 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1025 (ISSET_PIXCOLOR (Color_pointer_bg)
1100 ? pix_colors_focused[Color_pointer_bg] 1026 ? pix_colors_focused[Color_pointer_bg]
1101 : pix_colors_focused[Color_bg]; 1027 : pix_colors_focused[Color_bg]).get (bg);
1102 1028
1103 XQueryColors (display->display, display->cmap, xcol, 2); 1029 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1104 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1105} 1030}
1106 1031
1107/*----------------------------------------------------------------------*/ 1032/*----------------------------------------------------------------------*/
1108/* 1033/*
1109 * 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
1110 */ 1035 */
1111void 1036void
1112rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
1113{ 1038{
1114 unsigned int i; 1039 unsigned int i;
1115 const char *xpmb = "\0"; 1040 const char *xpmb = "";
1116 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1117 1042
1118 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1119 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
1120 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
1121 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
1122 if (pix_colors[Color_fg] == pix_colors[i]) 1046 if (pix_colors[Color_fg] == pix_colors[i])
1123 { 1047 {
… …
1127 1051
1128 for (i = Color_Black; i <= Color_White; i++) 1052 for (i = Color_Black; i <= Color_White; i++)
1129 if (pix_colors[Color_bg] == pix_colors[i]) 1053 if (pix_colors[Color_bg] == pix_colors[i])
1130 { 1054 {
1131 sprintf (bstr, "%d", (i - Color_Black)); 1055 sprintf (bstr, "%d", (i - Color_Black));
1132#ifdef XPM_BACKGROUND 1056#ifdef BG_IMAGE_FROM_FILE
1133 xpmb = "default;"; 1057 xpmb = "default;";
1134#endif 1058#endif
1135 break; 1059 break;
1136 } 1060 }
1137 1061
1138 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1062 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1139} 1063}
1140 1064
1141/*----------------------------------------------------------------------*/ 1065/*----------------------------------------------------------------------*/
1142 1066
1143int 1067bool
1144rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1068rxvt_term::set_color (rxvt_color &color, const char *name)
1145{ 1069{
1146 if (!screen_in_out->set (display, colour)) 1070 if (color.set (this, name))
1147 {
1148 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1149 return false;
1150 }
1151
1152 return true; 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]);
1153} 1081}
1154 1082
1155/* -------------------------------------------------------------------- * 1083/* -------------------------------------------------------------------- *
1156 * - WINDOW RESIZING - * 1084 * - WINDOW RESIZING - *
1157 * -------------------------------------------------------------------- */ 1085 * -------------------------------------------------------------------- */
1158void 1086void
1159rxvt_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)
1160{ 1088{
1161 int fix_screen; 1089 int fix_screen;
1162 int old_width = szHint.width, old_height = szHint.height; 1090 int old_width = szHint.width;
1163 dDisp; 1091 int old_height = szHint.height;
1164 1092
1165 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)))
1166 XSetWMNormalHints (disp, parent[0], &szHint); 1096 XSetWMNormalHints (dpy, parent[0], &szHint);
1167 1097
1168 if (!ignoreparent) 1098 if (!ignoreparent)
1169 { 1099 {
1170#ifdef SMART_RESIZE 1100#ifdef SMART_RESIZE
1171 /* 1101 /*
… …
1175 int x, y, x1, y1; 1105 int x, y, x1, y1;
1176 int dx, dy; 1106 int dx, dy;
1177 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1178 Window unused_cr; 1108 Window unused_cr;
1179 1109
1180 XTranslateCoordinates (disp, parent[0], display->root, 1110 XTranslateCoordinates (dpy, parent[0], display->root,
1181 0, 0, &x, &y, &unused_cr); 1111 0, 0, &x, &y, &unused_cr);
1182 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1112 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1183 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1184 /* 1114 /*
1185 * 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
1186 * our position for handles and decorations. Counter it 1116 * our position for handles and decorations. Counter it
1187 */ 1117 */
… …
1189 { 1119 {
1190 x -= x1; 1120 x -= x1;
1191 y -= y1; 1121 y -= y1;
1192 } 1122 }
1193 1123
1194 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1124 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1195 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1125 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1196 dx = old_width - szHint.width; 1126 dx = old_width - szHint.width;
1197 dy = old_height - szHint.height; 1127 dy = old_height - szHint.height;
1198 1128
1199 /* Check position of the center of the window */ 1129 /* Check position of the center of the window */
1200 if (x < x1) /* left half */ 1130 if (x < x1) /* left half */
1201 dx = 0; 1131 dx = 0;
… …
1204 if (y < y1) /* top half */ 1134 if (y < y1) /* top half */
1205 dy = 0; 1135 dy = 0;
1206 else if (y == y1) /* exact center */ 1136 else if (y == y1) /* exact center */
1207 dy /= 2; 1137 dy /= 2;
1208 1138
1209 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1139 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1210 szHint.width, szHint.height); 1140 szHint.width, szHint.height);
1211#else 1141#else
1212 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1213#endif 1143#endif
1214 } 1144 }
1215 1145
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1147
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1148 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1149 {
1220 if (scrollbar_visible ()) 1150 if (scrollBar.state)
1221 { 1151 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1152 XMoveResizeWindow (dpy, scrollBar.win,
1223 window_sb_x, 0, 1153 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1154 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1155 resize_scrollbar ();
1226 } 1156 }
1227 1157
1228 if (menubar_visible ())
1229 XMoveResizeWindow (disp, menuBar.win,
1230 window_vt_x, 0,
1231 width, menuBar_TotalHeight ());
1232
1233 XMoveResizeWindow (disp, vt, 1158 XMoveResizeWindow (dpy, vt,
1234 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
1235 width, height); 1160 width, height);
1236 1161
1162#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ())
1164 update_background ();
1165#endif
1166
1237 scr_clear (); 1167 scr_clear ();
1238#ifdef XPM_BACKGROUND
1239 resize_pixmap ();
1240#endif
1241 } 1168 }
1242 1169
1243 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
1244 {
1245 int curr_screen = -1;
1246 int old_ncol = prev_ncol;
1247
1248 /* scr_reset only works on the primary screen */
1249 if (old_height) /* this is not the first time through */
1250 {
1251 unsigned int ocol = ncol;
1252 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1253 curr_screen = scr_change_screen (PRIMARY);
1254 ncol = ocol;
1255 }
1256
1257 scr_reset (); 1171 scr_reset ();
1258 1172
1259 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
1260 { 1174 //scr_touch (false);
1261 scr_change_screen (curr_screen);
1262 selection_check (old_ncol != ncol ? 4 : 0);
1263 }
1264 }
1265 1175
1266 old_width = szHint.width; 1176#ifdef HAVE_BG_PIXMAP
1267 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 ?
1268 1178// if (bgPixmap.pixmap)
1269#ifdef XPM_BACKGROUND
1270 if (pixmap)
1271 scr_touch (false); 1179// scr_touch (false);
1272#endif 1180#endif
1273 1181
1274#ifdef USE_XIM 1182#ifdef USE_XIM
1275 IMSetStatusPosition (); 1183 IMSetPosition ();
1276#endif 1184#endif
1277} 1185}
1278 1186
1279/* 1187/*
1280 * 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.
… …
1285{ 1193{
1286 XWindowAttributes wattr; 1194 XWindowAttributes wattr;
1287 1195
1288 if (newwidth == 0 || newheight == 0) 1196 if (newwidth == 0 || newheight == 0)
1289 { 1197 {
1290 XGetWindowAttributes (display->display, display->root, &wattr); 1198 XGetWindowAttributes (dpy, display->root, &wattr);
1291 1199
1292 if (newwidth == 0) 1200 if (newwidth == 0)
1293 newwidth = wattr.width - szHint.base_width; 1201 newwidth = wattr.width - szHint.base_width;
1294 if (newheight == 0) 1202 if (newheight == 0)
1295 newheight = wattr.height - szHint.base_height; 1203 newheight = wattr.height - szHint.base_height;
… …
1309#ifdef USE_XIM 1217#ifdef USE_XIM
1310 1218
1311void 1219void
1312rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1220rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1313{ 1221{
1314 fg = pix_colors[Color_fg]; 1222 fg = pix_colors [Color_fg];
1315 bg = pix_colors[Color_bg]; 1223 bg = pix_colors [Color_bg];
1316} 1224}
1317 1225
1318void 1226void
1319rxvt_term::im_set_size (XRectangle &size) 1227rxvt_term::im_set_size (XRectangle &size)
1320{ 1228{
… …
1357 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1358 1266
1359 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1360 *p = '\0'; 1268 *p = '\0';
1361 1269
1362 atom = XInternAtom (display->display, server, False); 1270 atom = XInternAtom (dpy, server, False);
1363 win = XGetSelectionOwner (display->display, atom); 1271 win = XGetSelectionOwner (dpy, atom);
1364 1272
1365 if (win != None) 1273 if (win != None)
1366 return True; 1274 return True;
1367 } 1275 }
1368 1276
… …
1375 XPoint nspot; 1283 XPoint nspot;
1376 XVaNestedList preedit_attr; 1284 XVaNestedList preedit_attr;
1377 1285
1378 if (!Input_Context 1286 if (!Input_Context
1379 || !focus 1287 || !focus
1380 || !(input_style & XIMPreeditPosition)) 1288 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1381 return; 1289 return;
1382 1290
1383 im_set_position (nspot); 1291 im_set_position (nspot);
1384 1292
1385 if (nspot.x == spot.x && nspot.y == spot.y) 1293 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1404 input_method = 0; 1312 input_method = 0;
1405 } 1313 }
1406 1314
1407 Input_Context = 0; 1315 Input_Context = 0;
1408} 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
1409 1391
1410/* 1392/*
1411 * 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
1412 * open a suitable preedit type 1394 * open a suitable preedit type
1413 */ 1395 */
… …
1420 XRectangle rect, status_rect, needed_rect; 1402 XRectangle rect, status_rect, needed_rect;
1421 unsigned long fg, bg; 1403 unsigned long fg, bg;
1422 const char *p; 1404 const char *p;
1423 char **s; 1405 char **s;
1424 XIMStyles *xim_styles; 1406 XIMStyles *xim_styles;
1407#ifdef ENABLE_XIM_ONTHESPOT
1408 XIMCallback xcb[4];
1409#endif
1410
1411 set_environ (envv);
1425 1412
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1413 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1414 return false;
1428 1415
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1430 input_method = display->get_xim (locale, modifiers); 1416 input_method = display->get_xim (locale, modifiers);
1431 if (input_method == NULL) 1417 if (input_method == NULL)
1432 return false; 1418 return false;
1433 1419
1434 xim = input_method->xim; 1420 xim = input_method->xim;
… …
1454 s = rxvt_splitcommastring (p); 1440 s = rxvt_splitcommastring (p);
1455 1441
1456 for (i = found = 0; !found && s[i]; i++) 1442 for (i = found = 0; !found && s[i]; i++)
1457 { 1443 {
1458 if (!strcmp (s[i], "OverTheSpot")) 1444 if (!strcmp (s[i], "OverTheSpot"))
1459 input_style = (XIMPreeditPosition | XIMStatusNothing); 1445 input_style = XIMPreeditPosition | XIMStatusNothing;
1460 else if (!strcmp (s[i], "OffTheSpot")) 1446 else if (!strcmp (s[i], "OffTheSpot"))
1461 input_style = (XIMPreeditArea | XIMStatusArea); 1447 input_style = XIMPreeditArea | XIMStatusArea;
1462 else if (!strcmp (s[i], "Root")) 1448 else if (!strcmp (s[i], "Root"))
1463 input_style = (XIMPreeditNothing | XIMStatusNothing); 1449 input_style = XIMPreeditNothing | XIMStatusNothing;
1464 else if (!strcmp (s[i], "None")) 1450 else if (!strcmp (s[i], "None"))
1465 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;
1466 1458
1467 for (j = 0; j < xim_styles->count_styles; j++) 1459 for (j = 0; j < xim_styles->count_styles; j++)
1468 if (input_style == xim_styles->supported_styles[j]) 1460 if (input_style == xim_styles->supported_styles[j])
1469 { 1461 {
1470 rxvt_freecommastring (s); 1462 rxvt_freecommastring (s);
… …
1508 "*", 1500 "*",
1509 fheight, 1501 fheight,
1510 fheight + 1, fheight - 1, 1502 fheight + 1, fheight - 1,
1511 fheight - 2, fheight + 2); 1503 fheight - 2, fheight + 2);
1512 1504
1513 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1505 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1514 &missing_charset_list, &missing_charset_count, &def_string); 1506 &missing_charset_list, &missing_charset_count, &def_string);
1515 1507
1516 if (missing_charset_list) 1508 if (missing_charset_list)
1517 XFreeStringList (missing_charset_list); 1509 XFreeStringList (missing_charset_list);
1518 1510
… …
1559 XNBackground, bg, 1551 XNBackground, bg,
1560 XNArea, &status_rect, 1552 XNArea, &status_rect,
1561 XNFontSet, fs, 1553 XNFontSet, fs,
1562 NULL); 1554 NULL);
1563 } 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
1564 1579
1565 Input_Context = XCreateIC (xim, 1580 Input_Context = XCreateIC (xim,
1566 XNInputStyle, input_style, 1581 XNInputStyle, input_style,
1567 XNClientWindow, vt, 1582 XNClientWindow, vt,
1568 XNFocusWindow, parent[0], 1583 XNFocusWindow, parent[0],
… …
1570 preedit_attr, 1585 preedit_attr,
1571 status_attr ? XNStatusAttributes : NULL, 1586 status_attr ? XNStatusAttributes : NULL,
1572 status_attr, NULL); 1587 status_attr, NULL);
1573 1588
1574 if (preedit_attr) XFree (preedit_attr); 1589 if (preedit_attr) XFree (preedit_attr);
1575 if (status_attr) XFree (status_attr); 1590 if (status_attr) XFree (status_attr);
1576 if (fs) XFreeFontSet (display->display, fs); 1591 if (fs) XFreeFontSet (dpy, fs);
1577 1592
1578 if (Input_Context == NULL) 1593 if (Input_Context == NULL)
1579 { 1594 {
1580 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1595 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1581 im_destroy (); 1596 im_destroy ();
1582 return false; 1597 return false;
1583 } 1598 }
1584 1599
1585 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
1586 IMSetStatusPosition (); 1606 IMSetPosition ();
1587 1607
1588 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1589 return true; 1608 return true;
1590} 1609}
1591 1610
1592void 1611void
1593rxvt_term::im_cb () 1612rxvt_term::im_cb ()
… …
1595 int i; 1614 int i;
1596 const char *p; 1615 const char *p;
1597 char **s; 1616 char **s;
1598 char buf[IMBUFSIZ]; 1617 char buf[IMBUFSIZ];
1599 1618
1600 SET_R (this); 1619 make_current ();
1601 1620
1602 im_destroy (); 1621 im_destroy ();
1603 1622
1604 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605 if (Input_Context) 1623 if (Input_Context)
1606 return; 1624 return;
1607 1625
1608#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1626#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1609 if (rs[Rs_imLocale]) 1627 if (rs[Rs_imLocale])
… …
1651 SET_LOCALE (locale); 1669 SET_LOCALE (locale);
1652#endif 1670#endif
1653} 1671}
1654 1672
1655void 1673void
1656rxvt_term::IMSetStatusPosition () 1674rxvt_term::IMSetPosition ()
1657{ 1675{
1658 XRectangle preedit_rect, status_rect, *needed_rect; 1676 XRectangle preedit_rect, status_rect, *needed_rect;
1659 XVaNestedList preedit_attr, status_attr; 1677 XVaNestedList preedit_attr, status_attr;
1660 1678
1661 if (!Input_Context 1679 if (!Input_Context
1662 || !focus 1680 || !focus
1663 || !(input_style & XIMPreeditArea) 1681 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1664 || !IMisRunning ()) 1682 || !IMisRunning ())
1665 return; 1683 return;
1666 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 {
1667 /* Getting the necessary width of preedit area */ 1695 /* Getting the necessary width of preedit area */
1668 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1669 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1697 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1670 XFree (status_attr); 1698 XFree (status_attr);
1671 1699
1672 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1700 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1673 XFree (needed_rect); 1701 XFree (needed_rect);
1674 1702
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1703 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1704 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1677 1705
1678 XSetICValues (Input_Context, 1706 XSetICValues (Input_Context,
1679 XNPreeditAttributes, preedit_attr, 1707 XNPreeditAttributes, preedit_attr,
1680 XNStatusAttributes, status_attr, NULL); 1708 XNStatusAttributes, status_attr,
1709 NULL);
1681 1710
1711 XFree (status_attr);
1712 }
1713
1682 XFree (preedit_attr); 1714 XFree (preedit_attr);
1683 XFree (status_attr);
1684} 1715}
1685#endif /* USE_XIM */ 1716#endif /* USE_XIM */
1686 1717
1687/*----------------------------------------------------------------------*/ 1718void
1688rxvt_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 */
1689 1787
1690/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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