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

Diff Legend

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