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.23 by pcg, Sat Jan 31 03:18:43 2004 UTC vs.
Revision 1.30 by pcg, Thu Feb 12 01:53:25 2004 UTC

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

Diff Legend

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