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.30 by pcg, Thu Feb 12 01:53:25 2004 UTC vs.
Revision 1.70 by root, Mon Jul 26 18:01:19 2004 UTC

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

Diff Legend

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