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

Diff Legend

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