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

Diff Legend

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