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

Diff Legend

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