ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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