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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines