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.34 by pcg, Fri Feb 20 22:27:27 2004 UTC vs.
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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>
7 * - original version 7 * - original version
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
31 32
32#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
33#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
34#include "main.intpro" /* PROTOS for internal routines */ 35#include "main.intpro" /* PROTOS for internal routines */
35 36
36#include <signal.h> 37#include <csignal>
38#include <cstring>
37 39
38#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
39# include <grp.h> 41# include <grp.h>
40#endif 42#endif
41 43
42#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
43# include <termios.h> 45# include <termios.h>
44#endif 46#endif
45 47
46#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
51
52vector<rxvt_term *> rxvt_term::termlist;
47 53
48static char curlocale[128]; 54static char curlocale[128];
49 55
50void 56bool
51rxvt_set_locale (const char *locale) 57rxvt_set_locale (const char *locale)
52{ 58{
53 if (locale && STRNCMP (locale, curlocale, 128)) 59 if (!locale || !strncmp (locale, curlocale, 128))
54 { 60 return false;
61
55 STRNCPY (curlocale, locale, 128); 62 strncpy (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale); 63 setlocale (LC_CTYPE, curlocale);
64 return true;
65}
66
67#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite;
69
70text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
71{
72 compose_char *cc;
73
74 // break compose chains, as stupid readline really likes to duplicate
75 // composing characters for some reason near the end of a line.
76 cc = (*this)[c1];
77 while (cc)
57 } 78 {
58} 79 if (cc->c2 == c2) return c1;
80 cc = (*this)[cc->c1];
81 }
59 82
60void * 83 // check to see wether this combination already exists otherwise
61rxvt_term::operator new (size_t s) 84 for (cc = v.end (); cc-- > v.begin (); )
62{ 85 {
63 void *p = malloc (s); 86 if (cc->c1 == c1 && cc->c2 == c2)
87 return COMPOSE_LO + (cc - v.begin ());
88 }
64 89
65 MEMSET (p, 0, s); 90 // allocate a new combination
91 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
92 {
93 static int seen;
94
95 if (!seen++)
96 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
97
98 return REPLACEMENT_CHAR;
99 }
100
101 v.push_back (compose_char (c1, c2));
102
103 return v.size () - 1 + COMPOSE_LO;
104}
105
106int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
107{
108 compose_char *cc = (*this)[c];
109
110 if (!cc)
111 {
112 if (r) *r = c;
113 return 1;
114 }
115
116 int len = expand (cc->c1, r);
117
118 if (r) r += len;
119
120 if (cc->c2 != NOCHAR)
121 {
122 len++;
123 if (r) *r++ = cc->c2;
124 }
125
66 return p; 126 return len;
67}
68 127
69void
70rxvt_term::operator delete (void *p, size_t s)
71{
72 free (p);
73} 128}
129#endif
74 130
75rxvt_term::rxvt_term () 131rxvt_term::rxvt_term ()
76 : 132 :
133#if TRANSPARENT
77 rootwin_ev (this, &rxvt_term::rootwin_cb), 134 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif
136#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif
145#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb),
147#endif
148#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
149 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
150#endif
151#ifdef SELECTION_SCROLLING
152 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
153#endif
154#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
155 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
156#endif
157#ifdef POINTER_BLANK
158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
78 termwin_ev (this, &rxvt_term::x_cb), 166 termwin_ev (this, &rxvt_term::x_cb),
79 vt_ev (this, &rxvt_term::x_cb), 167 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif
83#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme
85#endif
86#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif
89#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif
92#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb),
94#endif
95 check_ev (this, &rxvt_term::check_cb), 168 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 170 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 171 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 172 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 173{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 174 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104}
105 175
106rxvt_term::~rxvt_term () 176 termlist.push_back (this);
177
178#ifdef KEYSYM_RESOURCE
179 keyboard = new keyboard_manager;
180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif
184}
185
186// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit
188void rxvt_term::emergency_cleanup ()
107{ 189{
108 if (cmd_fd >= 0) 190 if (cmd_pid)
109 close (cmd_fd); 191 kill (-cmd_pid, SIGHUP);
110 192
111#ifndef NO_SETOWNER_TTYDEV
112 privileged_ttydev (RESTORE);
113#endif
114#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
115 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
116#endif 195#endif
117 196
197 pty.put ();
198}
199
200rxvt_term::~rxvt_term ()
201{
202 termlist.erase (find (termlist.begin (), termlist.end(), this));
203
204 emergency_cleanup ();
205
206#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0])
209 delete TermWin.fontset[i];
210#endif
118 delete TermWin.fontset; 211 delete TermWin.fontset[0];
119 212
120 if (display) 213 if (display)
214 {
215 dDisp;
216
217 selection_clear ();
218
219#ifdef USE_XIM
220 im_destroy ();
221#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif
225#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC);
228#endif
229#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
231#endif
232#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
243#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
245 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
250
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows
121 if (TermWin.parent[0]) 258 if (TermWin.parent[0])
122 XDestroyWindow (display->display, TermWin.parent[0]); 259 XDestroyWindow (disp, TermWin.parent[0]);
260 }
123 261
124 // TODO: free pixcolours, colours should become part of rxvt_display 262 // TODO: free pixcolours, colours should become part of rxvt_display
125 263
126 delete PixColors; 264 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING
266 delete pix_colors_unfocused;
267#endif
127 268
128 displays.put (display); 269 displays.put (display);
129 270
130 scr_release (); 271 scr_release ();
131 272
273 /* clear all resources */
274 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]);
276
277 free (selection.text);
278 // TODO: manage env vars in child only(!)
132 free (env_windowid); 279 free (env_windowid);
133 free (env_display); 280 free (env_display);
134 free (env_term); 281 free (env_term);
135 free (env_colorfgbg); 282 free (env_colorfgbg);
136 free (locale); 283 free (locale);
137 free (codeset); 284 free (v_buffer);
285 free (incr_buf);
138 286
139 delete envv; 287 delete envv;
140 delete argv; 288 delete argv;
289
290#ifdef KEYSYM_RESOURCE
291 delete keyboard;
292#endif
141} 293}
142 294
143void 295void
144rxvt_term::destroy () 296rxvt_term::destroy ()
145{ 297{
298 if (destroy_ev.active)
299 return;
300
301#if ENABLE_OVERLAY
302 scr_overlay_off ();
303#endif
304
146 if (display) 305 if (display)
147 { 306 {
307#if USE_XIM
308 im_ev.stop (display);
309#endif
310#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display);
312#endif
313#if MENUBAR
314 menubar_ev.stop (display);
315#endif
316#if TRANSPARENT
148 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
318#endif
319 incr_ev.stop ();
149 termwin_ev.stop (display); 320 termwin_ev.stop (display);
150 vt_ev.stop (display); 321 vt_ev.stop (display);
151#ifdef USE_XIM
152 im_destroy ();
153 im_ev.stop (display);
154#endif
155#ifdef HAVE_SCROLLBARS
156 scrollbar_ev.stop (display);
157#endif
158#ifdef MENUBAR
159 menubar_ev.stop (display);
160#endif
161 } 322 }
162 323
163 check_ev.stop (); 324 check_ev.stop ();
164 pty_ev.stop (); 325 pty_ev.stop ();
165#ifdef CURSOR_BLINK 326#ifdef CURSOR_BLINK
166 cursor_blink_ev.stop (); 327 cursor_blink_ev.stop ();
167#endif 328#endif
168#ifdef TEXT_BLINK 329#ifdef TEXT_BLINK
169 text_blink_ev.stop (); 330 text_blink_ev.stop ();
170#endif 331#endif
332#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
333 cont_scroll_ev.stop ();
334#endif
335#ifdef SELECTION_SCROLLING
336 sel_scroll_ev.stop ();
337#endif
171#ifdef POINTER_BLANK 338#ifdef POINTER_BLANK
172 pointer_ev.stop (); 339 pointer_ev.stop ();
173#endif 340#endif
174 341
175 destroy_ev.start (0); 342 destroy_ev.start (0);
182 349
183 delete this; 350 delete this;
184} 351}
185 352
186/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
354/*
355 * Exit gracefully, clearing the utmp entry and restoring tty attributes
356 * TODO: if debugging, this should free up any known resources if we can
357 */
358static XErrorHandler old_xerror_handler;
359
360static void
361rxvt_emergency_cleanup ()
362{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup ();
365}
366
367int
368rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{
370 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code;
372 else
373 {
374 //TODO: GET_R is most likely not the terminal which caused the error
375 //TODO: maybe just output the error and continue?
376 old_xerror_handler (display, event);
377 GET_R->destroy ();
378 }
379
380 return 0;
381}
382
383int
384rxvt_xioerror_handler (Display *display)
385{
386 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
387 DisplayString (display));
388 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE);
390}
391
392/*
393 * Catch a fatal signal and tidy up before quitting
394 */
395void
396rxvt_term::sig_term (sig_watcher &w)
397{
398#ifdef DEBUG_CMD
399 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400#endif
401 rxvt_emergency_cleanup ();
402 signal (w.signum, SIG_DFL);
403 kill (getpid (), w.signum);
404}
405
406/*----------------------------------------------------------------------*/
187/* rxvt_init () */ 407/* rxvt_init () */
188/* LIBPROTO */
189rxvt_t
190rxvt_init (int argc, const char *const *argv)
191{
192 SET_R (new rxvt_term);
193
194 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
195 {
196 delete GET_R;
197 SET_R (0);
198 }
199
200 return GET_R;
201}
202
203static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
204
205void
206rxvt_init_signals ()
207{
208 /* install exit handler for cleanup */
209#if 0
210#ifdef HAVE_ATEXIT
211 atexit (rxvt_clean_exit);
212#else
213#endif
214#endif
215
216 struct sigaction sa;
217
218 sigfillset (&sa.sa_mask);
219 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
220 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
221 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
222 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
225 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
226
227 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
228 /* signal (SIGURG, SIG_DFL); */
229
230 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
231 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
232}
233
234bool 408bool
235rxvt_term::init (int argc, const char *const *argv) 409rxvt_term::init (int argc, const char *const *argv)
410{
411 SET_R (this);
412
413 set_locale ("");
414
415 if (!init_vars ())
416 return false;
417
418 init_secondary ();
419
420 const char **cmd_argv = init_resources (argc, argv);
421
422#ifdef KEYSYM_RESOURCE
423 keyboard->register_done ();
424#endif
425
426#if MENUBAR_MAX
427 menubar_read (rs[Rs_menu]);
428#endif
429#ifdef HAVE_SCROLLBARS
430 if (options & Opt_scrollBar)
431 scrollBar.setIdle (); /* set existence for size calculations */
432#endif
433
434 create_windows (argc, argv);
435
436 dDisp;
437
438 init_xlocale ();
439
440 scr_reset (); /* initialize screen */
441
442#if 0
443 XSynchronize (disp, True);
444#endif
445
446#ifdef HAVE_SCROLLBARS
447 if (options & Opt_scrollBar)
448 resize_scrollbar (); /* create and map scrollbar */
449#endif
450#if (MENUBAR_MAX)
451 if (menubar_visible ())
452 XMapWindow (disp, menuBar.win);
453#endif
454#ifdef TRANSPARENT
455 if (options & Opt_transparent)
456 {
457 XSelectInput (disp, display->root, PropertyChangeMask);
458 check_our_parents ();
459 rootwin_ev.start (display, display->root);
460 }
461#endif
462
463 XMapWindow (disp, TermWin.vt);
464 XMapWindow (disp, TermWin.parent[0]);
465
466 set_colorfgbg ();
467
468 init_command (cmd_argv);
469
470 free (cmd_argv);
471
472 pty_ev.start (pty.pty, EVENT_READ);
473
474 check_ev.start ();
475
476 return true;
477}
478
479void
480rxvt_init ()
236{ 481{
237 /* 482 /*
238 * Save and then give up any super-user privileges 483 * Save and then give up any super-user privileges
239 * If we need privileges in any area then we must specifically request it. 484 * If we need privileges in any area then we must specifically request it.
240 * We should only need to be root in these cases: 485 * We should only need to be root in these cases:
241 * 1. write utmp entries on some systems 486 * 1. write utmp entries on some systems
242 * 2. chown tty on some systems 487 * 2. chown tty on some systems
243 */ 488 */
244 privileges (SAVE); 489 rxvt_privileges (SAVE);
245 privileges (IGNORE); 490 rxvt_privileges (IGNORE);
246 491
247 init_secondary (); 492 signal (SIGHUP, SIG_IGN);
493 signal (SIGPIPE, SIG_IGN);
248 494
249 const char **cmd_argv = init_resources (argc, argv); 495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
496 /* signal (SIGURG, SIG_DFL); */
250 497
251 set_locale (""); 498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
252 499 // TODO: handle this with exceptions and tolerate the memory loss
253#if (MENUBAR_MAX) 500 XSetIOErrorHandler (rxvt_xioerror_handler);
254 menubar_read (rs[Rs_menu]);
255#endif
256#ifdef HAVE_SCROLLBARS
257 if (Options & Opt_scrollBar)
258 scrollBar.setIdle (); /* set existence for size calculations */
259#endif
260
261 create_windows (argc, argv);
262
263 init_xlocale ();
264
265 scr_reset (); /* initialize screen */
266#ifdef RXVT_GRAPHICS
267 Gr_reset (); /* reset graphics */
268#endif
269
270#if 1
271 XSynchronize (display->display, True);
272#endif
273
274#ifdef HAVE_SCROLLBARS
275 if (Options & Opt_scrollBar)
276 resize_scrollbar (); /* create and map scrollbar */
277#endif
278#if (MENUBAR_MAX)
279 if (menubar_visible (r))
280 XMapWindow (display->display, menuBar.win);
281#endif
282#ifdef TRANSPARENT
283 if (Options & Opt_transparent)
284 {
285 XSelectInput (display->display, display->root, PropertyChangeMask);
286 check_our_parents ();
287 }
288#endif
289
290 rootwin_ev.start (display, display->root);
291
292 XMapWindow (display->display, TermWin.vt);
293 XMapWindow (display->display, TermWin.parent[0]);
294
295 init_command (cmd_argv);
296
297 pty_ev.start (cmd_fd, EVENT_READ);
298
299 check_ev.start ();
300
301 return true;
302} 501}
303 502
304/* ------------------------------------------------------------------------- * 503/* ------------------------------------------------------------------------- *
305 * SIGNAL HANDLING & EXIT HANDLER * 504 * SIGNAL HANDLING & EXIT HANDLER *
306 * ------------------------------------------------------------------------- */ 505 * ------------------------------------------------------------------------- */
307/* 506/*
308 * Catch a SIGCHLD signal and exit if the direct child has died 507 * Catch a SIGCHLD signal and exit if the direct child has died
309 */ 508 */
310/* ARGSUSED */ 509
311/* EXTPROTO */ 510void
312RETSIGTYPE 511rxvt_term::sig_chld (sig_watcher &w)
313rxvt_Child_signal (int sig __attribute__ ((unused)))
314{ 512{
315 int pid, save_errno = errno; 513 // we are being called for every SIGCHLD, not just ours
514 int pid;
515
316 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 516 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
317 ; 517 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
318 errno = save_errno;
319
320#if 0
321 if (pid == cmd_pid) 518 if (pid == (*t)->cmd_pid)
322 exit (EXIT_SUCCESS); 519 {
323#endif 520 (*t)->destroy ();
324} 521 break;
325 522 }
326/*
327 * Catch a fatal signal and tidy up before quitting
328 */
329/* EXTPROTO */
330RETSIGTYPE
331rxvt_Exit_signal (int sig)
332{
333 signal (sig, SIG_DFL);
334#ifdef DEBUG_CMD
335 rxvt_print_error ("signal %d", sig);
336#endif
337 rxvt_clean_exit ();
338 kill (getpid (), sig);
339}
340
341/* INTPROTO */
342int
343rxvt_xerror_handler (Display *display, XErrorEvent *event)
344{
345 if (GET_R->allowedxerror == -1)
346 GET_R->allowedxerror = event->error_code;
347 else
348 {
349 old_xerror_handler (display, event);
350 GET_R->destroy ();
351 }
352
353 return 0;
354}
355
356/*----------------------------------------------------------------------*/
357/*
358 * Exit gracefully, clearing the utmp entry and restoring tty attributes
359 * TODO: if debugging, this should free up any known resources if we can
360 */
361/* EXTPROTO */
362void
363rxvt_clean_exit ()
364{
365 // TODO: rxvtd should clean up all ressources
366 if (GET_R)
367 GET_R->destroy ();
368} 523}
369 524
370/* ------------------------------------------------------------------------- * 525/* ------------------------------------------------------------------------- *
371 * MEMORY ALLOCATION WRAPPERS * 526 * MEMORY ALLOCATION WRAPPERS *
372 * ------------------------------------------------------------------------- */ 527 * ------------------------------------------------------------------------- */
373/* EXTPROTO */ 528void *
374void *
375rxvt_malloc (size_t size) 529rxvt_malloc (size_t size)
376{ 530{
377 void *p;
378
379 p = malloc (size); 531 void *p = malloc (size);
532
380 if (p) 533 if (!p)
534 rxvt_fatal ("memory allocation failure. aborting.\n");
535
381 return p; 536 return p;
382
383 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
384 rxvt_clean_exit ();
385 exit (EXIT_FAILURE);
386 /* NOTREACHED */
387} 537}
388 538
389/* EXTPROTO */ 539/* INTPROTO */
390void * 540void *
391rxvt_calloc (size_t number, size_t size) 541rxvt_calloc (size_t number, size_t size)
392{ 542{
393 void *p;
394
395 p = calloc (number, size); 543 void *p = calloc (number, size);
544
396 if (p) 545 if (!p)
546 rxvt_fatal ("memory allocation failure. aborting.\n");
547
397 return p; 548 return p;
398
399 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
400 rxvt_clean_exit ();
401 exit (EXIT_FAILURE);
402 /* NOTREACHED */
403} 549}
404 550
405/* EXTPROTO */ 551/* INTPROTO */
406void * 552void *
407rxvt_realloc (void *ptr, size_t size) 553rxvt_realloc (void *ptr, size_t size)
408{ 554{
409 void *p;
410
411 if (ptr)
412 p = realloc (ptr, size); 555 void *p = realloc (ptr, size);
413 else 556
414 p = malloc (size);
415 if (p) 557 if (!p)
558 rxvt_fatal ("memory allocation failure. aborting.\n");
559
416 return p; 560 return p;
417
418 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
419 rxvt_clean_exit ();
420 exit (EXIT_FAILURE);
421 /* NOTREACHED */
422} 561}
423 562
424/* ------------------------------------------------------------------------- * 563/* ------------------------------------------------------------------------- *
425 * PRIVILEGED OPERATIONS * 564 * PRIVILEGED OPERATIONS *
426 * ------------------------------------------------------------------------- */ 565 * ------------------------------------------------------------------------- */
427/* take care of suid/sgid super-user (root) privileges */ 566/* take care of suid/sgid super-user (root) privileges */
428void 567void
429rxvt_term::privileges (int mode) 568rxvt_privileges (rxvt_privaction action)
430{ 569{
570#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
571 static uid_t euid;
572 static gid_t egid;
573#endif
574
431#if ! defined(__CYGWIN32__) 575#if ! defined(__CYGWIN32__)
432# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 576# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
433 /* setreuid () is the poor man's setuid (), seteuid () */ 577 /* setreuid () is the poor man's setuid (), seteuid () */
434# define seteuid(a) setreuid(-1, (a)) 578# define seteuid(a) setreuid(-1, (a))
435# define setegid(a) setregid(-1, (a)) 579# define setegid(a) setregid(-1, (a))
436# define HAVE_SETEUID 580# define HAVE_SETEUID
437# endif 581# endif
438# ifdef HAVE_SETEUID 582# ifdef HAVE_SETEUID
439 switch (mode) 583 switch (action)
440 { 584 {
441 case IGNORE: 585 case IGNORE:
442 /* 586 /*
443 * change effective uid/gid - not real uid/gid - so we can switch 587 * change effective uid/gid - not real uid/gid - so we can switch
444 * back to root later, as required 588 * back to root later, as required
454 seteuid (euid); 598 seteuid (euid);
455 setegid (egid); 599 setegid (egid);
456 break; 600 break;
457 } 601 }
458# else 602# else
459 switch (mode) 603 switch (action)
460 { 604 {
461 case IGNORE: 605 case IGNORE:
462 setuid (getuid ()); 606 setuid (getuid ());
463 setgid (getgid ()); 607 setgid (getgid ());
464 /* FALLTHROUGH */ 608 /* FALLTHROUGH */
471#endif 615#endif
472} 616}
473 617
474#ifdef UTMP_SUPPORT 618#ifdef UTMP_SUPPORT
475void 619void
476rxvt_term::privileged_utmp (char action) 620rxvt_term::privileged_utmp (rxvt_privaction action)
477{ 621{
478 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
479 action, next_utmp_action, getpid ()));
480 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
481 || (Options & Opt_utmpInhibit) 622 if ((options & Opt_utmpInhibit)
482 || ttydev == NULL || *ttydev == '\0') 623 || !pty.name || !*pty.name)
483 return; 624 return;
484 625
485 privileges (RESTORE); 626 rxvt_privileges (RESTORE);
627
486 if (action == SAVE) 628 if (action == SAVE)
487 {
488 next_utmp_action = RESTORE;
489 makeutent (ttydev, rs[Rs_display_name]); 629 makeutent (pty.name, rs[Rs_display_name]);
490 }
491 else 630 else
492 { /* action == RESTORE */
493 next_utmp_action = IGNORE;
494 cleanutent (); 631 cleanutent ();
495 } 632
496 privileges (IGNORE); 633 rxvt_privileges (IGNORE);
497}
498#endif
499
500#ifndef NO_SETOWNER_TTYDEV
501void
502rxvt_term::privileged_ttydev (char action)
503{
504 D_MAIN ((stderr,
505 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
506 action, next_tty_action, getpid ()));
507 if (next_tty_action != action || (action != SAVE && action != RESTORE)
508 || ttydev == NULL || *ttydev == '\0')
509 return;
510
511 privileges (RESTORE);
512
513 if (action == SAVE)
514 {
515 next_tty_action = RESTORE;
516# ifndef RESET_TTY_TO_COMMON_DEFAULTS
517 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
518 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
519 next_tty_action = IGNORE;
520 else
521# endif
522
523 {
524 chown (ttydev, getuid (), ttygid); /* fail silently */
525 chmod (ttydev, ttymode);
526# ifdef HAVE_REVOKE
527 revoke (ttydev);
528# endif
529
530 }
531 }
532 else
533 { /* action == RESTORE */
534 next_tty_action = IGNORE;
535# ifndef RESET_TTY_TO_COMMON_DEFAULTS
536 chmod (ttydev, ttyfd_stat.st_mode);
537 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
538# else
539 chmod (ttydev,
540 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
541 chown (ttydev, 0, 0);
542# endif
543
544 }
545
546 privileges (IGNORE);
547
548# ifndef RESET_TTY_TO_COMMON_DEFAULTS
549 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
550 action == RESTORE ? "Restoring" : (action ==
551 SAVE ? "Saving" :
552 "UNKNOWN ERROR for"), ttydev,
553 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
554 ttyfd_stat.st_gid));
555# endif
556} 634}
557#endif 635#endif
558 636
559/*----------------------------------------------------------------------*/ 637/*----------------------------------------------------------------------*/
560/* 638/*
562 * if width/height are non-zero then override calculated width/height 640 * if width/height are non-zero then override calculated width/height
563 */ 641 */
564void 642void
565rxvt_term::window_calc (unsigned int width, unsigned int height) 643rxvt_term::window_calc (unsigned int width, unsigned int height)
566{ 644{
567 short recalc_x, recalc_y; 645 short recalc_x, recalc_y;
568 int x, y, sb_w, mb_h, flags; 646 int x, y, sb_w, mb_h, flags;
569 unsigned int w, h; 647 unsigned int w, h;
570 unsigned int max_width, max_height; 648 unsigned int max_width, max_height;
649 dDisp;
571 650
572 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
573 TermWin.ncol, TermWin.nrow, szHint.width, 652 TermWin.ncol, TermWin.nrow, szHint.width,
574 szHint.height)); 653 szHint.height));
575 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
615 else 694 else
616 szHint.win_gravity = SouthWestGravity; 695 szHint.win_gravity = SouthWestGravity;
617 } 696 }
618 } 697 }
619 } 698 }
699
620 /* TODO: BOUNDS */ 700 /* TODO: BOUNDS */
621 TermWin.width = TermWin.ncol * TermWin.fwidth; 701 TermWin.width = TermWin.ncol * TermWin.fwidth;
622 TermWin.height = TermWin.nrow * TermWin.fheight; 702 TermWin.height = TermWin.nrow * TermWin.fheight;
623 max_width = MAX_COLS * TermWin.fwidth; 703 max_width = MAX_COLS * TermWin.fwidth;
624 max_height = MAX_ROWS * TermWin.fheight; 704 max_height = MAX_ROWS * TermWin.fheight;
625 705
626 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
627 707
628 sb_w = mb_h = 0; 708 sb_w = mb_h = 0;
629 window_vt_x = window_vt_y = 0; 709 window_vt_x = window_vt_y = TermWin.int_bwidth;
710
630 if (scrollbar_visible ()) 711 if (scrollbar_visible ())
631 { 712 {
632 sb_w = scrollbar_TotalWidth (); 713 sb_w = scrollbar_TotalWidth ();
633 szHint.base_width += sb_w; 714 szHint.base_width += sb_w;
634 if (! (Options & Opt_scrollBar_right)) 715 if (!(options & Opt_scrollBar_right))
635 window_vt_x = sb_w; 716 window_vt_x += sb_w;
636 } 717 }
718
637 if (menubar_visible ()) 719 if (menubar_visible ())
638 { 720 {
639 mb_h = menuBar_TotalHeight (); 721 mb_h = menuBar_TotalHeight ();
640 szHint.base_height += mb_h; 722 szHint.base_height += mb_h;
641 window_vt_y = mb_h; 723 window_vt_y += mb_h;
642 } 724 }
725
643 szHint.width_inc = TermWin.fwidth; 726 szHint.width_inc = TermWin.fwidth;
644 szHint.height_inc = TermWin.fheight; 727 szHint.height_inc = TermWin.fheight;
645 szHint.min_width = szHint.base_width + szHint.width_inc; 728 szHint.min_width = szHint.base_width + szHint.width_inc;
646 szHint.min_height = szHint.base_height + szHint.height_inc; 729 szHint.min_height = szHint.base_height + szHint.height_inc;
647 730
653 else 736 else
654 { 737 {
655 MIN_IT (TermWin.width, max_width); 738 MIN_IT (TermWin.width, max_width);
656 szHint.width = szHint.base_width + TermWin.width; 739 szHint.width = szHint.base_width + TermWin.width;
657 } 740 }
741
658 if (height && height - szHint.base_height < max_height) 742 if (height && height - szHint.base_height < max_height)
659 { 743 {
660 szHint.height = height; 744 szHint.height = height;
661 TermWin.height = height - szHint.base_height; 745 TermWin.height = height - szHint.base_height;
662 } 746 }
663 else 747 else
664 { 748 {
665 MIN_IT (TermWin.height, max_height); 749 MIN_IT (TermWin.height, max_height);
666 szHint.height = szHint.base_height + TermWin.height; 750 szHint.height = szHint.base_height + TermWin.height;
667 } 751 }
752
668 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 753 if (scrollbar_visible () && (options & Opt_scrollBar_right))
669 window_sb_x = szHint.width - sb_w; 754 window_sb_x = szHint.width - sb_w;
670 755
671 if (recalc_x) 756 if (recalc_x)
672 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 757 szHint.x += (DisplayWidth (disp, display->screen)
673 - szHint.width - 2 * TermWin.ext_bwidth); 758 - szHint.width - 2 * TermWin.ext_bwidth);
674 if (recalc_y) 759 if (recalc_y)
675 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 760 szHint.y += (DisplayHeight (disp, display->screen)
676 - szHint.height - 2 * TermWin.ext_bwidth); 761 - szHint.height - 2 * TermWin.ext_bwidth);
677 762
678 TermWin.ncol = TermWin.width / TermWin.fwidth; 763 TermWin.ncol = TermWin.width / TermWin.fwidth;
679 TermWin.nrow = TermWin.height / TermWin.fheight; 764 TermWin.nrow = TermWin.height / TermWin.fheight;
680 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
689 * Called after a window size change. 774 * Called after a window size change.
690 */ 775 */
691void 776void
692rxvt_term::tt_winch () 777rxvt_term::tt_winch ()
693{ 778{
779 if (pty.pty < 0)
780 return;
781
694 struct winsize ws; 782 struct winsize ws;
695
696 if (cmd_fd < 0)
697 return;
698 783
699 ws.ws_col = TermWin.ncol; 784 ws.ws_col = TermWin.ncol;
700 ws.ws_row = TermWin.nrow; 785 ws.ws_row = TermWin.nrow;
701 ws.ws_xpixel = ws.ws_ypixel = 0; 786 ws.ws_xpixel = TermWin.width;
702#ifndef DEBUG_SIZE 787 ws.ws_ypixel = TermWin.height;
703 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
704#else 789
705 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 790#if 0
706 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
707# ifdef SIGWINCH
708 else if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
709 kill (cmd_pid, SIGWINCH); 793 kill (cmd_pid, SIGWINCH);
710# endif
711#endif 794#endif
712} 795}
713 796
714/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
715/* rxvt_change_font () - Switch to a new font */ 798/* set_fonts () - load and set the various fonts
716/* 799/*
717 * init = 1 - initialize 800 * init = 1 - initialize
718 * 801 *
719 * fontname == FONT_UP - switch to bigger font 802 * fontname == FONT_UP - switch to bigger font
720 * fontname == FONT_DN - switch to smaller font 803 * fontname == FONT_DN - switch to smaller font
721 */ 804 */
722void 805bool
723rxvt_term::change_font (int init, const char *fontname) 806rxvt_term::set_fonts ()
724{} 807{
808 rxvt_fontset *fs = new rxvt_fontset (this);
809 rxvt_fontprop prop;
725 810
726void 811 if (!fs
727rxvt_term::font_up_down (int n, int direction) 812 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
728{} 813 || !fs->realize_font (1))
814 {
815 delete fs;
816 return false;
817 }
818
819#if ENABLE_STYLES
820 for (int i = RS_styleCount; --i; )
821 if (TermWin.fontset[i] != TermWin.fontset[0])
822 delete TermWin.fontset[i];
823#endif
824
825 delete TermWin.fontset[0];
826 TermWin.fontset[0] = fs;
827
828 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace;
830 fs->set_prop (prop);
831
832 TermWin.fwidth = prop.width;
833 TermWin.fheight = prop.height;
834 TermWin.fweight = prop.weight;
835 TermWin.fslant = prop.slant;
836 TermWin.fbase = (*fs)[1]->ascent;
837
838 for (int style = 1; style < 4; style++)
839 {
840#if ENABLE_STYLES
841 const char *res = rs[Rs_font + style];
842
843 if (res && !*res)
844 TermWin.fontset[style] = TermWin.fontset[0];
845 else
846 {
847 TermWin.fontset[style] = fs = new rxvt_fontset (this);
848 rxvt_fontprop prop2 = prop;
849
850 if (res)
851 prop2.weight = prop2.slant = rxvt_fontprop::unset;
852 else
853 {
854 res = TermWin.fontset[0]->fontdesc;
855
856 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
857 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
858 }
859
860 fs->populate (res);
861 fs->set_prop (prop2);
862 }
863#else
864 TermWin.fontset[style] = TermWin.fontset[0];
865#endif
866 }
867
868 if (TermWin.parent[0])
869 {
870 resize_all_windows (0, 0, 0);
871 scr_remap_chars ();
872 scr_touch (true);
873 }
874
875 return true;
876}
877
878void rxvt_term::set_string_property (Atom prop, const char *str, int len)
879{
880 // TODO: SMART_WINDOW_TITLE
881 XChangeProperty (display->display, TermWin.parent[0],
882 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884}
885
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{
888 // TODO: SMART_WINDOW_TITLE
889 wchar_t *ws = rxvt_mbstowcs (str, len);
890 char *s = rxvt_wcstoutf8 (ws);
891
892 XChangeProperty (display->display, TermWin.parent[0],
893 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894 (const unsigned char *)s, strlen (s));
895
896 free (s);
897 free (ws);
898}
729 899
730/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
731/*----------------------------------------------------------------------*/ 901/*----------------------------------------------------------------------*/
732/* xterm sequences - title, iconName, color (exptl) */ 902/* xterm sequences - title, iconName, color (exptl) */
733void 903void
734rxvt_term::set_title (const char *str) 904rxvt_term::set_title (const char *str)
735{ 905{
736#ifndef SMART_WINDOW_TITLE 906 set_string_property (XA_WM_NAME, str);
737 XStoreName (display->display, TermWin.parent[0], str); 907#if ENABLE_FRILLS
738#else 908 set_utf8_property (xa[XA_NET_WM_NAME], str);
739 char *name;
740
741 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
742 name = NULL;
743 if (name == NULL || STRCMP (name, str))
744 XStoreName (display->display, TermWin.parent[0], str);
745 if (name)
746 XFree (name);
747#endif 909#endif
748} 910}
749 911
750void 912void
751rxvt_term::set_iconName (const char *str) 913rxvt_term::set_icon_name (const char *str)
752{ 914{
753#ifndef SMART_WINDOW_TITLE 915 set_string_property (XA_WM_ICON_NAME, str);
754 XSetIconName (display->display, TermWin.parent[0], str); 916#if ENABLE_FRILLS
755#else 917 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
756 char *name;
757
758 if (XGetIconName (display->display, TermWin.parent[0], &name))
759 name = NULL;
760 if (name == NULL || STRCMP (name, str))
761 XSetIconName (display->display, TermWin.parent[0], str);
762 if (name)
763 XFree (name);
764#endif 918#endif
765} 919}
766 920
767#ifdef XTERM_COLOR_CHANGE 921#ifdef XTERM_COLOR_CHANGE
768void 922void
769rxvt_term::set_window_color (int idx, const char *color) 923rxvt_term::set_window_color (int idx, const char *color)
770{ 924{
771 rxvt_color xcol; 925 rxvt_color xcol;
772 int i; 926 int i;
773 927
774 if (color == NULL || *color == '\0') 928 if (color == NULL || *color == '\0')
775 return; 929 return;
776 930
777 /* handle color aliases */ 931 /* handle color aliases */
778 if (isdigit (*color)) 932 if (isdigit (*color))
779 { 933 {
780 i = atoi (color); 934 i = atoi (color);
935
781 if (i >= 8 && i <= 15) 936 if (i >= 8 && i <= 15)
782 { /* bright colors */ 937 { /* bright colors */
783 i -= 8; 938 i -= 8;
784# ifndef NO_BRIGHTCOLOR 939# ifndef NO_BRIGHTCOLOR
785 PixColors[idx] = PixColors[minBrightCOLOR + i]; 940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
786 SET_PIXCOLOR (idx); 941 SET_PIXCOLOR (idx);
787 goto Done; 942 goto Done;
788# endif 943# endif
789
790 } 944 }
945
791 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
792 { /* normal colors */ 947 { /* normal colors */
793 PixColors[idx] = PixColors[minCOLOR + i]; 948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
794 SET_PIXCOLOR (idx); 949 SET_PIXCOLOR (idx);
795 goto Done; 950 goto Done;
796 } 951 }
797 } 952 }
953
798 if (!rXParseAllocColor (& xcol, color)) 954 if (!rXParseAllocColor (&xcol, color))
799 return; 955 return;
956
800 /* XStoreColor (display->display, XCMAP, XColor*); */ 957 /* XStoreColor (display->display, display->cmap, XColor*); */
801 958
802 /* 959 /*
803 * FIXME: should free colors here, but no idea how to do it so instead, 960 * FIXME: should free colors here, but no idea how to do it so instead,
804 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
805 */ 962 */
806# if 0 963# if 0
807 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
808 if (PixColors[idx] == PixColors[i]) 965 if (pix_colors[idx] == pix_colors[i])
809 break; 966 break;
810 if (i > Color_White) 967 if (i > Color_White)
811 { 968 {
812 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 969 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
813 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 970 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
814 DisplayPlanes (display->display, display->screen)); 971 DisplayPlanes (display->display, display->screen));
815 } 972 }
816# endif 973# endif
817 974
818 PixColors[idx] = xcol; 975 pix_colors_focused[idx] = xcol;
819 SET_PIXCOLOR (idx); 976 SET_PIXCOLOR (idx);
820 977
821 /* XSetWindowAttributes attr; */ 978 /* XSetWindowAttributes attr; */
822 /* Cursor cursor; */ 979 /* Cursor cursor; */
823Done: 980Done:
824 if (idx == Color_bg && ! (Options & Opt_transparent)) 981#ifdef OFF_FOCUS_FADING
825 XSetWindowBackground (display->display, TermWin.vt, 982 if (rs[Rs_fade])
826 PixColors[Color_bg]); 983 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
984#endif
827 985
828 /* handle Color_BD, scrollbar background, etc. */ 986 /*TODO: handle Color_BD, scrollbar background, etc. */
829 987
830 set_colorfgbg ();
831 recolour_cursor (); 988 recolour_cursor ();
832 /* the only reasonable way to enforce a clean update */ 989 scr_recolour ();
833 scr_poweron ();
834} 990}
835 991
836#else 992#else
837# define set_window_color (idx,color) ((void)0) 993# define set_window_color (idx,color) ((void)0)
838#endif /* XTERM_COLOR_CHANGE */ 994#endif /* XTERM_COLOR_CHANGE */
839 995
840void 996void
841rxvt_term::recolour_cursor () 997rxvt_term::recolour_cursor ()
842{ 998{
843#if TODO
844 rxvt_color xcol[2]; 999 XColor xcol[2];
845 1000
846 xcol[0] = PixColors[Color_pointer]; 1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
847 xcol[1] = PixColors[Color_bg]; 1002 ? pix_colors_focused[Color_pointer_fg]
1003 : pix_colors_focused[Color_fg];
1004 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1005 ? pix_colors_focused[Color_pointer_bg]
1006 : pix_colors_focused[Color_bg];
1007
848 XQueryColors (display->display, XCMAP, xcol, 2); 1008 XQueryColors (display->display, display->cmap, xcol, 2);
849 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1009 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
850#endif
851} 1010}
852 1011
853/*----------------------------------------------------------------------*/ 1012/*----------------------------------------------------------------------*/
854/* 1013/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 1014 * find if fg/bg matches any of the normal (low-intensity) colors
856 */ 1015 */
857void 1016void
858rxvt_term::set_colorfgbg () 1017rxvt_term::set_colorfgbg ()
859{ 1018{
860 unsigned int i; 1019 unsigned int i;
861 const char *xpmb = "\0"; 1020 const char *xpmb = "\0";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1021 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
863 1022
864 env_colorfgbg =
865 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
866 STRCPY (fstr, "default"); 1024 strcpy (fstr, "default");
867 STRCPY (bstr, "default"); 1025 strcpy (bstr, "default");
868 for (i = Color_Black; i <= Color_White; i++) 1026 for (i = Color_Black; i <= Color_White; i++)
869 if (PixColors[Color_fg] == PixColors[i]) 1027 if (pix_colors[Color_fg] == pix_colors[i])
870 { 1028 {
871 sprintf (fstr, "%d", (i - Color_Black)); 1029 sprintf (fstr, "%d", (i - Color_Black));
872 break; 1030 break;
873 } 1031 }
1032
874 for (i = Color_Black; i <= Color_White; i++) 1033 for (i = Color_Black; i <= Color_White; i++)
875 if (PixColors[Color_bg] == PixColors[i]) 1034 if (pix_colors[Color_bg] == pix_colors[i])
876 { 1035 {
877 sprintf (bstr, "%d", (i - Color_Black)); 1036 sprintf (bstr, "%d", (i - Color_Black));
878#ifdef XPM_BACKGROUND 1037#ifdef XPM_BACKGROUND
879 xpmb = "default;"; 1038 xpmb = "default;";
880#endif 1039#endif
881 break; 1040 break;
882 } 1041 }
883 1042
884 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1043 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
885
886#ifndef NO_BRIGHTCOLOR
887 colorfgbg = DEFAULT_RSTYLE;
888 for (i = minCOLOR; i <= maxCOLOR; i++)
889 {
890 if (PixColors[Color_fg] == PixColors[i])
891 colorfgbg = SET_FGCOLOR (colorfgbg, i);
892 if (PixColors[Color_bg] == PixColors[i])
893 colorfgbg = SET_BGCOLOR (colorfgbg, i);
894 }
895#endif
896} 1044}
897 1045
898/*----------------------------------------------------------------------*/ 1046/*----------------------------------------------------------------------*/
899/*
900 * Colour determination for low colour displays, routine from
901 * Hans de Goede <hans@highrise.nl>
902 */
903 1047
904int 1048int
905rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1049rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
906{ 1050{
907 if (!screen_in_out->set (display, colour)) 1051 if (!screen_in_out->set (display, colour))
908 { 1052 {
909 rxvt_print_error ("can't allocate colour: %s", colour); 1053 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
910 return false; 1054 return false;
911 } 1055 }
912 1056
913 return true; 1057 return true;
914} 1058}
918 * -------------------------------------------------------------------- */ 1062 * -------------------------------------------------------------------- */
919void 1063void
920rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
921{ 1065{
922 int fix_screen; 1066 int fix_screen;
923
924#ifdef SMART_RESIZE 1067#ifdef SMART_RESIZE
925 int old_width = szHint.width, old_height = szHint.height; 1068 int old_width = szHint.width, old_height = szHint.height;
926#endif 1069#endif
1070 dDisp;
927 1071
928 window_calc (width, height); 1072 window_calc (width, height);
929 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1074
930 if (!ignoreparent) 1075 if (!ignoreparent)
931 { 1076 {
932#ifdef SMART_RESIZE 1077#ifdef SMART_RESIZE
933 /* 1078 /*
934 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1079 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
937 int x, y, x1, y1; 1082 int x, y, x1, y1;
938 int dx, dy; 1083 int dx, dy;
939 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
940 Window unused_cr; 1085 Window unused_cr;
941 1086
942 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
943 0, 0, &x, &y, &unused_cr); 1088 0, 0, &x, &y, &unused_cr);
944 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
945 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
946 /* 1091 /*
947 * if display->root isn't the parent window, a WM will probably have offset 1092 * if display->root isn't the parent window, a WM will probably have offset
948 * our position for handles and decorations. Counter it 1093 * our position for handles and decorations. Counter it
949 */ 1094 */
951 { 1096 {
952 x -= x1; 1097 x -= x1;
953 y -= y1; 1098 y -= y1;
954 } 1099 }
955 1100
956 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1101 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
957 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1102 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
958 dx = old_width - szHint.width; 1103 dx = old_width - szHint.width;
959 dy = old_height - szHint.height; 1104 dy = old_height - szHint.height;
960 1105
961 /* Check position of the center of the window */ 1106 /* Check position of the center of the window */
962 if (x < x1) /* left half */ 1107 if (x < x1) /* left half */
966 if (y < y1) /* top half */ 1111 if (y < y1) /* top half */
967 dy = 0; 1112 dy = 0;
968 else if (y == y1) /* exact center */ 1113 else if (y == y1) /* exact center */
969 dy /= 2; 1114 dy /= 2;
970 1115
971 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
972 szHint.width, szHint.height); 1117 szHint.width, szHint.height);
973#else 1118#else
974 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
975 szHint.height);
976#endif 1120#endif
977
978 } 1121 }
979 1122
980 fix_screen = (TermWin.ncol != prev_ncol 1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
981 || TermWin.nrow != prev_nrow);
982 1124
983 if (fix_screen || width != old_width || height != old_height) 1125 if (fix_screen || width != old_width || height != old_height)
984 { 1126 {
985 if (scrollbar_visible ()) 1127 if (scrollbar_visible ())
986 { 1128 {
987 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1129 XMoveResizeWindow (disp, scrollBar.win,
1130 window_sb_x, 0,
988 0, scrollbar_TotalWidth (), szHint.height); 1131 scrollbar_TotalWidth (), szHint.height);
989 resize_scrollbar (); 1132 resize_scrollbar ();
990 } 1133 }
991 1134
992 if (menubar_visible ()) 1135 if (menubar_visible ())
993 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1136 XMoveResizeWindow (disp, menuBar.win,
1137 window_vt_x, 0,
994 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1138 TermWin_TotalWidth (), menuBar_TotalHeight ());
995 1139
996 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1140 XMoveResizeWindow (disp, TermWin.vt,
997 window_vt_y, TermWin_TotalWidth (), 1141 window_vt_x, window_vt_y,
998 TermWin_TotalHeight ()); 1142 TermWin_TotalWidth (), TermWin_TotalHeight ());
999#ifdef RXVT_GRAPHICS 1143
1000 if (old_height)
1001 Gr_Resize (old_width - szHint.base_width,
1002 old_height - szHint.base_height);
1003#endif
1004 scr_clear (); 1144 scr_clear ();
1005#ifdef XPM_BACKGROUND 1145#ifdef XPM_BACKGROUND
1006 resize_pixmap (); 1146 resize_pixmap ();
1007#endif 1147#endif
1008
1009 } 1148 }
1010 1149
1011 if (fix_screen || old_height == 0) 1150 if (fix_screen || old_height == 0)
1012 { 1151 {
1013 int curr_screen = -1; 1152 int curr_screen = -1;
1032 } 1171 }
1033 1172
1034 old_width = szHint.width; 1173 old_width = szHint.width;
1035 old_height = szHint.height; 1174 old_height = szHint.height;
1036 1175
1176#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap)
1178 scr_touch (false);
1179#endif
1180
1037#ifdef USE_XIM 1181#ifdef USE_XIM
1038 IMSetStatusPosition (); 1182 IMSetStatusPosition ();
1039#endif 1183#endif
1040} 1184}
1041 1185
1054 if (width == 0) 1198 if (width == 0)
1055 width = wattr.width - szHint.base_width; 1199 width = wattr.width - szHint.base_width;
1056 if (height == 0) 1200 if (height == 0)
1057 height = wattr.height - szHint.base_height; 1201 height = wattr.height - szHint.base_height;
1058 } 1202 }
1203
1059 if (width != TermWin.width || height != TermWin.height) 1204 if (width != TermWin.width || height != TermWin.height)
1060 { 1205 {
1061 width += szHint.base_width; 1206 width += szHint.base_width;
1062 height += szHint.base_height; 1207 height += szHint.base_height;
1063 resize_all_windows (width, height, 0); 1208 resize_all_windows (width, height, 0);
1068 * - X INPUT METHOD ROUTINES - * 1213 * - X INPUT METHOD ROUTINES - *
1069 * -------------------------------------------------------------------- */ 1214 * -------------------------------------------------------------------- */
1070#ifdef USE_XIM 1215#ifdef USE_XIM
1071 1216
1072void 1217void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{
1220 fg = pix_colors[Color_fg];
1221 bg = pix_colors[Color_bg];
1222}
1223
1224void
1073rxvt_term::im_set_size (XRectangle *size) 1225rxvt_term::im_set_size (XRectangle &size)
1074{ 1226{
1227 // the int_bwidth terms make no sense to me
1075 size->x = TermWin.int_bwidth; 1228 size.x = TermWin.int_bwidth;
1076 size->y = TermWin.int_bwidth; 1229 size.y = TermWin.int_bwidth;
1077 size->width = Width2Pixel (TermWin.ncol); 1230 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1078 size->height = Height2Pixel (TermWin.nrow); 1231 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1079} 1232}
1080 1233
1081void 1234void
1082rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236 XRectangle &status_rect,
1237 const XRectangle &needed_rect)
1083{ 1238{
1084 *fg = PixColors[Color_fg]; 1239 preedit_rect.x = needed_rect.width;
1085 *bg = PixColors[Color_bg]; 1240 preedit_rect.y = 0;
1241 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1242 preedit_rect.height = TermWin.fheight;
1243
1244 status_rect.x = 0;
1245 status_rect.y = 0;
1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1247 status_rect.height = TermWin.fheight;
1086} 1248}
1087 1249
1088/* Checking whether input method is running. */ 1250/* Checking whether input method is running. */
1089bool 1251bool
1090rxvt_term::IMisRunning () 1252rxvt_term::IMisRunning ()
1091{ 1253{
1092 char *p; 1254 char *p;
1093 Atom atom; 1255 Atom atom;
1094 Window win; 1256 Window win;
1095 char server[IMBUFSIZ]; 1257 char server[IMBUFSIZ];
1096 1258
1097 /* get current locale modifier */ 1259 /* get current locale modifier */
1098 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1260 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1099 { 1261 {
1100 STRCPY (server, "@server="); 1262 strcpy (server, "@server=");
1101 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264
1102 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1103 *p = '\0'; 1266 *p = '\0';
1104 1267
1105 atom = XInternAtom (display->display, server, False); 1268 atom = XInternAtom (display->display, server, False);
1106 win = XGetSelectionOwner (display->display, atom); 1269 win = XGetSelectionOwner (display->display, atom);
1270
1107 if (win != None) 1271 if (win != None)
1108 return True; 1272 return True;
1109 } 1273 }
1274
1110 return False; 1275 return False;
1111} 1276}
1112 1277
1113void 1278void
1114rxvt_term::IMSendSpot () 1279rxvt_term::IMSendSpot ()
1115{ 1280{
1116 XPoint spot; 1281 XPoint nspot;
1117 XVaNestedList preedit_attr; 1282 XVaNestedList preedit_attr;
1118 1283
1119 if (Input_Context == NULL 1284 if (!Input_Context
1285 || !TermWin.focus
1120 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1286 || !(input_style & XIMPreeditPosition))
1121 || ! (event_type == KeyPress
1122 || event_type == Expose
1123 || event_type == NoExpose
1124 || event_type == SelectionNotify
1125 || event_type == ButtonRelease || event_type == FocusIn)
1126 || !IMisRunning ())
1127 return; 1287 return;
1128 1288
1129 im_set_position (&spot); 1289 im_set_position (nspot);
1290
1291 if (nspot.x == spot.x && nspot.y == spot.y)
1292 return;
1293
1294 spot = nspot;
1130 1295
1131 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1296 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1132 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1297 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1133 XFree (preedit_attr); 1298 XFree (preedit_attr);
1134} 1299}
1135 1300
1136void 1301void
1137rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1138 XRectangle * needed_rect)
1139{
1140 int mbh, vtx = 0;
1141
1142 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1143 vtx = scrollbar_TotalWidth ();
1144
1145 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1146 mbh -= TermWin.lineSpace;
1147
1148 preedit_rect->x = needed_rect->width + vtx;
1149 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1150
1151 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1152 preedit_rect->height = Height2Pixel (1);
1153
1154 status_rect->x = vtx;
1155 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1156
1157 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1158 status_rect->height = Height2Pixel (1);
1159}
1160
1161void
1162rxvt_term::im_destroy () 1302rxvt_term::im_destroy ()
1163{ 1303{
1164 if (Input_Context)
1165 {
1166 XDestroyIC (Input_Context);
1167 Input_Context = NULL;
1168 }
1169
1170 if (input_method) 1304 if (input_method)
1171 { 1305 {
1306 if (Input_Context && input_method->xim)
1307 XDestroyIC (Input_Context);
1308
1172 display->put_xim (input_method); 1309 display->put_xim (input_method);
1173 input_method = 0; 1310 input_method = 0;
1174 } 1311 }
1312
1313 Input_Context = 0;
1175} 1314}
1176 1315
1177/* 1316/*
1178 * Try to open a XIM with the current modifiers, then see if we can 1317 * Try to open a XIM with the current modifiers, then see if we can
1179 * open a suitable preedit type 1318 * open a suitable preedit type
1180 */ 1319 */
1181bool 1320bool
1182rxvt_term::IM_get_IC (const char *modifiers) 1321rxvt_term::IM_get_IC (const char *modifiers)
1183{ 1322{
1184 int i, j, found; 1323 int i, j, found;
1185 XIM xim; 1324 XIM xim;
1186 XPoint spot; 1325 XPoint spot;
1187 XRectangle rect, status_rect, needed_rect; 1326 XRectangle rect, status_rect, needed_rect;
1188 unsigned long fg, bg; 1327 unsigned long fg, bg;
1189 const char *p; 1328 const char *p;
1190 char **s; 1329 char **s;
1191 XIMStyles *xim_styles; 1330 XIMStyles *xim_styles;
1192 XVaNestedList preedit_attr, status_attr;
1193 1331
1194 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1195 return false; 1333 return false;
1196 1334
1197 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1335 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1198 input_method = display->get_xim (locale, modifiers); 1336 input_method = display->get_xim (locale, modifiers);
1199 if (input_method == NULL) 1337 if (input_method == NULL)
1200 return false; 1338 return false;
1201 1339
1202 xim = input_method->xim; 1340 xim = input_method->xim;
1341 spot.x = spot.y = -1;
1203 1342
1204 xim_styles = NULL; 1343 xim_styles = NULL;
1205 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1344 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1206 || !xim_styles || !xim_styles->count_styles) 1345 || !xim_styles || !xim_styles->count_styles)
1207 { 1346 {
1208 display->put_xim (input_method); 1347 im_destroy ();
1209 return false; 1348 return false;
1210 } 1349 }
1211 1350
1212 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1351 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1352
1353 for (int pi = 0; pi < 2; pi++)
1354 {
1355 p = pet[pi];
1356
1357 if (!p)
1358 continue;
1359
1213 s = rxvt_splitcommastring (p); 1360 s = rxvt_splitcommastring (p);
1361
1214 for (i = found = 0; !found && s[i]; i++) 1362 for (i = found = 0; !found && s[i]; i++)
1215 { 1363 {
1216 if (!STRCMP (s[i], "OverTheSpot")) 1364 if (!strcmp (s[i], "OverTheSpot"))
1217 input_style = (XIMPreeditPosition | XIMStatusNothing); 1365 input_style = (XIMPreeditPosition | XIMStatusNothing);
1218 else if (!STRCMP (s[i], "OffTheSpot")) 1366 else if (!strcmp (s[i], "OffTheSpot"))
1219 input_style = (XIMPreeditArea | XIMStatusArea); 1367 input_style = (XIMPreeditArea | XIMStatusArea);
1220 else if (!STRCMP (s[i], "Root")) 1368 else if (!strcmp (s[i], "Root"))
1221 input_style = (XIMPreeditNothing | XIMStatusNothing); 1369 input_style = (XIMPreeditNothing | XIMStatusNothing);
1370 else if (!strcmp (s[i], "None"))
1371 input_style = (XIMPreeditNone | XIMStatusNone);
1222 1372
1223 for (j = 0; j < xim_styles->count_styles; j++) 1373 for (j = 0; j < xim_styles->count_styles; j++)
1224 if (input_style == xim_styles->supported_styles[j]) 1374 if (input_style == xim_styles->supported_styles[j])
1225 { 1375 {
1376 rxvt_freecommastring (s);
1377
1226 found = 1; 1378 found = 1;
1227 break; 1379 goto foundpet;
1380 }
1381
1228 } 1382 }
1229 }
1230 1383
1231 for (i = 0; s[i]; i++) 1384 rxvt_freecommastring (s);
1232 free (s[i]); 1385 }
1233 1386
1234 free (s); 1387foundpet:
1388
1235 XFree (xim_styles); 1389 XFree (xim_styles);
1236 1390
1237 if (!found) 1391 if (!found)
1238 { 1392 {
1239 display->put_xim (input_method); 1393 im_destroy ();
1240 return false; 1394 return false;
1241 } 1395 }
1242 1396
1243 preedit_attr = status_attr = NULL; 1397 XFontSet fs = 0;
1398 XVaNestedList preedit_attr = 0, status_attr = 0;
1399
1400 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1401 {
1402 // fake us a font-set, please
1403 char **missing_charset_list;
1404 int missing_charset_count;
1405 char *def_string;
1406 char pat[512];
1407
1408 sprintf (pat,
1409 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1410 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1414 "*",
1415 TermWin.fheight,
1416 TermWin.fheight + 1, TermWin.fheight - 1,
1417 TermWin.fheight - 2, TermWin.fheight + 2);
1418
1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420 &missing_charset_list, &missing_charset_count, &def_string);
1421
1422 if (missing_charset_list)
1423 XFreeStringList (missing_charset_list);
1424
1425 if (!fs)
1426 {
1427 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1428 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1429 }
1430 }
1244 1431
1245 if (input_style & XIMPreeditPosition) 1432 if (input_style & XIMPreeditPosition)
1246 { 1433 {
1247 im_set_size (&rect); 1434 im_set_size (rect);
1248 im_set_position (&spot); 1435 im_set_position (spot);
1249 im_set_color (&fg, &bg); 1436 im_set_color (fg, bg);
1250 1437
1251 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1438 preedit_attr = XVaCreateNestedList (0,
1439 XNForeground, fg,
1440 XNBackground, bg,
1441 XNArea, &rect,
1252 XNSpotLocation, &spot, 1442 XNSpotLocation, &spot,
1253 XNForeground, fg, XNBackground, bg,
1254 //XNFontSet, TermWin.fontset, 1443 XNFontSet, fs,
1255 NULL); 1444 NULL);
1256 } 1445 }
1257 else if (input_style & XIMPreeditArea) 1446 else if (input_style & XIMPreeditArea)
1258 { 1447 {
1259 im_set_color (&fg, &bg); 1448 im_set_color (fg, bg);
1260 1449
1261 /* 1450 /*
1262 * The necessary width of preedit area is unknown 1451 * The necessary width of preedit area is unknown
1263 * until create input context. 1452 * until create input context.
1264 */ 1453 */
1265 needed_rect.width = 0; 1454 needed_rect.width = 0;
1266
1267 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1455 im_set_preedit_area (rect, status_rect, needed_rect);
1268 1456
1269 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1457 preedit_attr = XVaCreateNestedList (0,
1458 XNForeground, fg,
1270 XNForeground, fg, XNBackground, bg, 1459 XNBackground, bg,
1460 XNArea, &rect,
1461 XNFontSet, fs,
1462 NULL);
1463 status_attr = XVaCreateNestedList (0,
1464 XNForeground, fg,
1465 XNBackground, bg,
1466 XNArea, &status_rect,
1271 //XNFontSet, TermWin.fontset, 1467 XNFontSet, fs,
1272 NULL); 1468 NULL);
1273 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1274 XNForeground, fg, XNBackground, bg,
1275 //XNFontSet, TermWin.fontset,
1276 NULL);
1277 } 1469 }
1278 1470
1279 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1471 Input_Context = XCreateIC (xim,
1472 XNInputStyle, input_style,
1280 XNClientWindow, TermWin.parent[0], 1473 XNClientWindow, TermWin.vt,
1281 XNFocusWindow, TermWin.parent[0], 1474 XNFocusWindow, TermWin.parent[0],
1282 preedit_attr ? XNPreeditAttributes : NULL, 1475 preedit_attr ? XNPreeditAttributes : NULL,
1283 preedit_attr, 1476 preedit_attr,
1284 status_attr ? XNStatusAttributes : NULL, 1477 status_attr ? XNStatusAttributes : NULL,
1285 status_attr, NULL); 1478 status_attr, NULL);
1479
1286 if (preedit_attr) XFree (preedit_attr); 1480 if (preedit_attr) XFree (preedit_attr);
1287 if (status_attr) XFree (status_attr); 1481 if (status_attr) XFree (status_attr);
1482 if (fs) XFreeFontSet (display->display, fs);
1288 1483
1289 if (Input_Context == NULL) 1484 if (Input_Context == NULL)
1290 { 1485 {
1291 rxvt_print_error ("failed to create input context"); 1486 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1292 display->put_xim (input_method); 1487 im_destroy ();
1293 return false; 1488 return false;
1294 } 1489 }
1295 1490
1296 if (input_style & XIMPreeditArea) 1491 if (input_style & XIMPreeditArea)
1297 IMSetStatusPosition (); 1492 IMSetStatusPosition ();
1314 if (Input_Context) 1509 if (Input_Context)
1315 return; 1510 return;
1316 1511
1317#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1512#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1318 if (rs[Rs_imLocale]) 1513 if (rs[Rs_imLocale])
1319 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1514 SET_LOCALE (rs[Rs_imLocale]);
1320#endif 1515#endif
1321 1516
1322 p = rs[Rs_inputMethod]; 1517 p = rs[Rs_inputMethod];
1323 if (p && *p) 1518 if (p && *p)
1324 { 1519 {
1325 bool found = false; 1520 bool found = false;
1326 1521
1327 s = rxvt_splitcommastring (p); 1522 s = rxvt_splitcommastring (p);
1523
1328 for (i = 0; s[i]; i++) 1524 for (i = 0; s[i]; i++)
1329 { 1525 {
1330 if (*s[i]) 1526 if (*s[i])
1331 { 1527 {
1332 STRCPY (buf, "@im="); 1528 strcpy (buf, "@im=");
1333 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1529 strncat (buf, s[i], IMBUFSIZ - 5);
1334 if (IM_get_IC (buf)) 1530 if (IM_get_IC (buf))
1335 { 1531 {
1336 found = true; 1532 found = true;
1337 break; 1533 break;
1338 } 1534 }
1339 } 1535 }
1340 } 1536 }
1341 for (i = 0; s[i]; i++) 1537
1342 free (s[i]); 1538 rxvt_freecommastring (s);
1343 free (s);
1344 1539
1345 if (found) 1540 if (found)
1346 goto done; 1541 goto done;
1347 } 1542 }
1348 1543
1355 goto done; 1550 goto done;
1356 1551
1357done: 1552done:
1358#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1553#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1359 if (rs[Rs_imLocale]) 1554 if (rs[Rs_imLocale])
1360 setlocale (LC_CTYPE, locale); 1555 SET_LOCALE (locale);
1361#endif 1556#endif
1362} 1557}
1363 1558
1364void 1559void
1365rxvt_term::IMSetStatusPosition () 1560rxvt_term::IMSetStatusPosition ()
1366{ 1561{
1367 XRectangle preedit_rect, status_rect, *needed_rect; 1562 XRectangle preedit_rect, status_rect, *needed_rect;
1368 XVaNestedList preedit_attr, status_attr; 1563 XVaNestedList preedit_attr, status_attr;
1369 1564
1370 if (Input_Context == NULL 1565 if (!Input_Context
1566 || !TermWin.focus
1371 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1567 || !(input_style & XIMPreeditArea)
1372 || !IMisRunning ()) 1568 || !IMisRunning ())
1373 return; 1569 return;
1374 1570
1375 /* Getting the necessary width of preedit area */ 1571 /* Getting the necessary width of preedit area */
1376 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1572 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1377 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1573 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1378 XFree (status_attr); 1574 XFree (status_attr);
1379 1575
1380 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1576 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1577 XFree (needed_rect);
1381 1578
1382 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1579 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1383 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1580 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1384 1581
1385 XSetICValues (Input_Context, 1582 XSetICValues (Input_Context,
1386 XNPreeditAttributes, preedit_attr, 1583 XNPreeditAttributes, preedit_attr,
1387 XNStatusAttributes, status_attr, NULL); 1584 XNStatusAttributes, status_attr, NULL);
1388 1585
1389 XFree (preedit_attr); 1586 XFree (preedit_attr);
1390 XFree (status_attr); 1587 XFree (status_attr);
1391} 1588}
1392#endif /* USE_XIM */ 1589#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines