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

Diff Legend

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