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

Diff Legend

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