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

Diff Legend

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