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

Diff Legend

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