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

Diff Legend

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