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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines