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.26 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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