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.54 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.119 by root, Mon Dec 13 01:29:03 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines