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.27 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.65 by pcg, Fri Apr 2 15:15:26 2004 UTC

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

Diff Legend

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