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

Diff Legend

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