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.24 by pcg, Sat Jan 31 03:26:28 2004 UTC vs.
Revision 1.31 by pcg, Fri Feb 13 12:11:05 2004 UTC

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

Diff Legend

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