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

Diff Legend

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