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

Diff Legend

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