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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines