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

Diff Legend

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