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

Diff Legend

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