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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines