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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines