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.30 by pcg, Thu Feb 12 01:53:25 2004 UTC vs.
Revision 1.132 by root, Thu Feb 3 07:18:30 2005 UTC

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

Diff Legend

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