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

Diff Legend

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