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

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

Diff Legend

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