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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines