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

Diff Legend

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