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.65 by pcg, Fri Apr 2 15:15:26 2004 UTC vs.
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
51static char curlocale[128]; 51static char curlocale[128];
52 52
53bool 53bool
54rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
55{ 55{
56 if (!locale || !STRNCMP (locale, curlocale, 128)) 56 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 57 return false;
58 58
59 STRNCPY (curlocale, locale, 128); 59 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
61 return true; 61 return true;
62} 62}
63 63
64#if ENABLE_COMBINING 64#if ENABLE_COMBINING
128void * 128void *
129rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
130{ 130{
131 void *p = malloc (s); 131 void *p = malloc (s);
132 132
133 MEMSET (p, 0, s); 133 memset (p, 0, s);
134 return p; 134 return p;
135} 135}
136 136
137void 137void
138rxvt_term::operator delete (void *p, size_t s) 138rxvt_term::operator delete (void *p, size_t s)
140 free (p); 140 free (p);
141} 141}
142 142
143rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
144 : 144 :
145#if TRANSPARENT
145 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
146 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
147 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifdef POINTER_BLANK
161 pointer_ev (this, &rxvt_term::pointer_cb),
162#endif
163#ifdef USE_XIM
164 im_ev (this, &rxvt_term::im_cb),
165#endif
166 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb),
167 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
168 pty_ev (this, &rxvt_term::pty_cb), 180 pty_ev (this, &rxvt_term::pty_cb),
169 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
170{ 182{
171 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
175 187
176rxvt_term::~rxvt_term () 188rxvt_term::~rxvt_term ()
177{ 189{
178 termlist.erase (find (termlist.begin (), termlist.end(), this)); 190 termlist.erase (find (termlist.begin (), termlist.end(), this));
179 191
180 if (cmd_fd >= 0) 192 if (cmd_pid)
181 close (cmd_fd); 193 kill (-cmd_pid, SIGHUP);
182 194
183#ifndef NO_SETOWNER_TTYDEV 195 pty.put ();
184 privileged_ttydev (RESTORE); 196
185#endif
186#ifdef UTMP_SUPPORT 197#ifdef UTMP_SUPPORT
187 privileged_utmp (RESTORE); 198 privileged_utmp (RESTORE);
188#endif 199#endif
189 200
190 delete TermWin.fontset; 201 delete TermWin.fontset;
191 202
192 if (display) 203 if (display)
193 { 204 {
194 selection_clear (); 205 selection_clear ();
195 206
207#ifdef USE_XIM
208 im_destroy ();
209#endif
196#ifdef MENUBAR 210#ifdef MENUBAR
197 if (menubarGC) XFreeGC (display->display, menubarGC); 211 if (menubarGC) XFreeGC (display->display, menubarGC);
198#endif 212#endif
199#ifdef XTERM_SCROLLBAR 213#ifdef XTERM_SCROLLBAR
200 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 214 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201 if (ShadowGC) XFreeGC (display->display, ShadowGC); 215 if (ShadowGC) XFreeGC (display->display, ShadowGC);
202#endif 216#endif
233 XDestroyWindow (display->display, TermWin.parent[0]); 247 XDestroyWindow (display->display, TermWin.parent[0]);
234 } 248 }
235 249
236 // TODO: free pixcolours, colours should become part of rxvt_display 250 // TODO: free pixcolours, colours should become part of rxvt_display
237 251
238 delete PixColors; 252 delete pix_colors_focused;
253#ifdef OFF_FOCUS_FADING
254 delete pix_colors_unfocused;
255#endif
239 256
240 displays.put (display); 257 displays.put (display);
241 258
242 scr_release (); 259 scr_release ();
243 260
261} 278}
262 279
263void 280void
264rxvt_term::destroy () 281rxvt_term::destroy ()
265{ 282{
283 if (destroy_ev.active)
284 return;
285
286#if ENABLE_OVERLAY
287 scr_overlay_off ();
288#endif
289
266 if (display) 290 if (display)
267 { 291 {
292#if USE_XIM
293 im_ev.stop (display);
294#endif
295#if HAVE_SCROLLBARS
296 scrollbar_ev.stop (display);
297#endif
298#if MENUBAR
299 menubar_ev.stop (display);
300#endif
301#if TRANSPARENT
268 rootwin_ev.stop (display); 302 rootwin_ev.stop (display);
303#endif
304 incr_ev.stop ();
269 termwin_ev.stop (display); 305 termwin_ev.stop (display);
270 vt_ev.stop (display); 306 vt_ev.stop (display);
271#ifdef USE_XIM
272 im_destroy ();
273 im_ev.stop (display);
274#endif
275#ifdef HAVE_SCROLLBARS
276 scrollbar_ev.stop (display);
277#endif
278#ifdef MENUBAR
279 menubar_ev.stop (display);
280#endif
281 } 307 }
282 308
283 check_ev.stop (); 309 check_ev.stop ();
284 pty_ev.stop (); 310 pty_ev.stop ();
285#ifdef CURSOR_BLINK 311#ifdef CURSOR_BLINK
286 cursor_blink_ev.stop (); 312 cursor_blink_ev.stop ();
287#endif 313#endif
288#ifdef TEXT_BLINK 314#ifdef TEXT_BLINK
289 text_blink_ev.stop (); 315 text_blink_ev.stop ();
290#endif 316#endif
317#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
318 cont_scroll_ev.stop ();
319#endif
320#ifdef SELECTION_SCROLLING
321 sel_scroll_ev.stop ();
322#endif
291#ifdef POINTER_BLANK 323#ifdef POINTER_BLANK
292 pointer_ev.stop (); 324 pointer_ev.stop ();
293#endif 325#endif
294 326
295 destroy_ev.start (0); 327 destroy_ev.start (0);
311 SET_R (this); 343 SET_R (this);
312 344
313 if (!init_vars ()) 345 if (!init_vars ())
314 return false; 346 return false;
315 347
348 init_secondary ();
349
350 const char **cmd_argv = init_resources (argc, argv);
351
352 set_locale ("");
353
354#if MENUBAR_MAX
355 menubar_read (rs[Rs_menu]);
356#endif
357#ifdef HAVE_SCROLLBARS
358 if (options & Opt_scrollBar)
359 scrollBar.setIdle (); /* set existence for size calculations */
360#endif
361
362 create_windows (argc, argv);
363
364 init_xlocale ();
365
366 scr_reset (); /* initialize screen */
367
368#if 0
369 XSynchronize (display->display, True);
370#endif
371
372#ifdef HAVE_SCROLLBARS
373 if (options & Opt_scrollBar)
374 resize_scrollbar (); /* create and map scrollbar */
375#endif
376#if (MENUBAR_MAX)
377 if (menubar_visible ())
378 XMapWindow (display->display, menuBar.win);
379#endif
380#ifdef TRANSPARENT
381 if (options & Opt_transparent)
382 {
383 XSelectInput (display->display, display->root, PropertyChangeMask);
384 check_our_parents ();
385 rootwin_ev.start (display, display->root);
386 }
387#endif
388
389 XMapWindow (display->display, TermWin.vt);
390 XMapWindow (display->display, TermWin.parent[0]);
391
392 init_command (cmd_argv);
393
394 pty_ev.start (pty.pty, EVENT_READ);
395
396 check_ev.start ();
397
398 return true;
399}
400
401static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
402
403void
404rxvt_init ()
405{
406 /* install exit handler for cleanup */
407#if 0
408#ifdef HAVE_ATEXIT
409 atexit (rxvt_clean_exit);
410#else
411#endif
412#endif
316 /* 413 /*
317 * Save and then give up any super-user privileges 414 * Save and then give up any super-user privileges
318 * If we need privileges in any area then we must specifically request it. 415 * If we need privileges in any area then we must specifically request it.
319 * We should only need to be root in these cases: 416 * We should only need to be root in these cases:
320 * 1. write utmp entries on some systems 417 * 1. write utmp entries on some systems
321 * 2. chown tty on some systems 418 * 2. chown tty on some systems
322 */ 419 */
323 privileges (SAVE); 420 rxvt_privileges (SAVE);
324 privileges (IGNORE); 421 rxvt_privileges (IGNORE);
325
326 init_secondary ();
327
328 const char **cmd_argv = init_resources (argc, argv);
329
330 set_locale ("");
331
332#if MENUBAR_MAX
333 menubar_read (rs[Rs_menu]);
334#endif
335#ifdef HAVE_SCROLLBARS
336 if (Options & Opt_scrollBar)
337 scrollBar.setIdle (); /* set existence for size calculations */
338#endif
339
340 create_windows (argc, argv);
341
342 init_xlocale ();
343
344 scr_reset (); /* initialize screen */
345
346#if 0
347 XSynchronize (display->display, True);
348#endif
349
350#ifdef HAVE_SCROLLBARS
351 if (Options & Opt_scrollBar)
352 resize_scrollbar (); /* create and map scrollbar */
353#endif
354#if (MENUBAR_MAX)
355 if (menubar_visible ())
356 XMapWindow (display->display, menuBar.win);
357#endif
358#ifdef TRANSPARENT
359 if (Options & Opt_transparent)
360 {
361 XSelectInput (display->display, display->root, PropertyChangeMask);
362 check_our_parents ();
363 }
364#endif
365
366 rootwin_ev.start (display, display->root);
367
368 XMapWindow (display->display, TermWin.vt);
369 XMapWindow (display->display, TermWin.parent[0]);
370
371 init_command (cmd_argv);
372
373 pty_ev.start (cmd_fd, EVENT_READ);
374
375 check_ev.start ();
376
377 return true;
378}
379
380static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
382void
383rxvt_init_signals ()
384{
385 /* install exit handler for cleanup */
386#if 0
387#ifdef HAVE_ATEXIT
388 atexit (rxvt_clean_exit);
389#else
390#endif
391#endif
392 422
393 struct sigaction sa; 423 struct sigaction sa;
394 424
395 sigfillset (&sa.sa_mask); 425 sigfillset (&sa.sa_mask);
396 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 426 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
424 break; 454 break;
425 } 455 }
426} 456}
427 457
428/* ARGSUSED */ 458/* ARGSUSED */
429/* EXTPROTO */ 459/* INTPROTO */
430RETSIGTYPE 460RETSIGTYPE
431rxvt_Child_signal (int sig __attribute__ ((unused))) 461rxvt_Child_signal (int sig __attribute__ ((unused)))
432{ 462{
433 int pid, save_errno = errno; 463 int pid, save_errno = errno;
434 464
439} 469}
440 470
441/* 471/*
442 * Catch a fatal signal and tidy up before quitting 472 * Catch a fatal signal and tidy up before quitting
443 */ 473 */
444/* EXTPROTO */ 474/* INTPROTO */
445RETSIGTYPE 475RETSIGTYPE
446rxvt_Exit_signal (int sig) 476rxvt_Exit_signal (int sig)
447{ 477{
448 signal (sig, SIG_DFL); 478 signal (sig, SIG_DFL);
449#ifdef DEBUG_CMD 479#ifdef DEBUG_CMD
471/*----------------------------------------------------------------------*/ 501/*----------------------------------------------------------------------*/
472/* 502/*
473 * Exit gracefully, clearing the utmp entry and restoring tty attributes 503 * Exit gracefully, clearing the utmp entry and restoring tty attributes
474 * TODO: if debugging, this should free up any known resources if we can 504 * TODO: if debugging, this should free up any known resources if we can
475 */ 505 */
476/* EXTPROTO */ 506/* INTPROTO */
477void 507void
478rxvt_clean_exit () 508rxvt_clean_exit ()
479{ 509{
480 // TODO: rxvtd should clean up all ressources 510 // TODO: rxvtd should clean up all ressources
481 if (GET_R) 511 if (GET_R)
483} 513}
484 514
485/* ------------------------------------------------------------------------- * 515/* ------------------------------------------------------------------------- *
486 * MEMORY ALLOCATION WRAPPERS * 516 * MEMORY ALLOCATION WRAPPERS *
487 * ------------------------------------------------------------------------- */ 517 * ------------------------------------------------------------------------- */
488/* EXTPROTO */ 518/* INTPROTO */
489void * 519void *
490rxvt_malloc (size_t size) 520rxvt_malloc (size_t size)
491{ 521{
492 void *p; 522 void *p;
493 523
494 p = malloc (size); 524 p = malloc (size);
495 if (p) 525 if (p)
496 return p; 526 return p;
497 527
498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 528 rxvt_fatal ("memory allocation failure. aborting.\n");
499 rxvt_clean_exit ();
500 exit (EXIT_FAILURE);
501 /* NOTREACHED */ 529 /* NOTREACHED */
502} 530}
503 531
504/* EXTPROTO */ 532/* INTPROTO */
505void * 533void *
506rxvt_calloc (size_t number, size_t size) 534rxvt_calloc (size_t number, size_t size)
507{ 535{
508 void *p; 536 void *p;
509 537
510 p = calloc (number, size); 538 p = calloc (number, size);
511 if (p) 539 if (p)
512 return p; 540 return p;
513 541
514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 542 rxvt_fatal ("memory allocation failure. aborting.\n");
515 rxvt_clean_exit ();
516 exit (EXIT_FAILURE);
517 /* NOTREACHED */ 543 /* NOTREACHED */
518} 544}
519 545
520/* EXTPROTO */ 546/* INTPROTO */
521void * 547void *
522rxvt_realloc (void *ptr, size_t size) 548rxvt_realloc (void *ptr, size_t size)
523{ 549{
524 void *p; 550 void *p;
525 551
526 if (ptr) 552 if (ptr)
527 p = realloc (ptr, size); 553 p = realloc (ptr, size);
528 else 554 else
529 p = malloc (size); 555 p = malloc (size);
556
530 if (p) 557 if (p)
531 return p; 558 return p;
532 559
533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 560 rxvt_fatal ("memory allocation failure. aborting.\n");
534 rxvt_clean_exit ();
535 exit (EXIT_FAILURE);
536 /* NOTREACHED */ 561 /* NOTREACHED */
537} 562}
538 563
539/* ------------------------------------------------------------------------- * 564/* ------------------------------------------------------------------------- *
540 * PRIVILEGED OPERATIONS * 565 * PRIVILEGED OPERATIONS *
541 * ------------------------------------------------------------------------- */ 566 * ------------------------------------------------------------------------- */
542/* take care of suid/sgid super-user (root) privileges */ 567/* take care of suid/sgid super-user (root) privileges */
543void 568void
544rxvt_term::privileges (int mode) 569rxvt_privileges (rxvt_privaction action)
545{ 570{
571#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
572 static uid_t euid;
573 static gid_t egid;
574#endif
575
546#if ! defined(__CYGWIN32__) 576#if ! defined(__CYGWIN32__)
547# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 577# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
548 /* setreuid () is the poor man's setuid (), seteuid () */ 578 /* setreuid () is the poor man's setuid (), seteuid () */
549# define seteuid(a) setreuid(-1, (a)) 579# define seteuid(a) setreuid(-1, (a))
550# define setegid(a) setregid(-1, (a)) 580# define setegid(a) setregid(-1, (a))
551# define HAVE_SETEUID 581# define HAVE_SETEUID
552# endif 582# endif
553# ifdef HAVE_SETEUID 583# ifdef HAVE_SETEUID
554 switch (mode) 584 switch (action)
555 { 585 {
556 case IGNORE: 586 case IGNORE:
557 /* 587 /*
558 * change effective uid/gid - not real uid/gid - so we can switch 588 * change effective uid/gid - not real uid/gid - so we can switch
559 * back to root later, as required 589 * back to root later, as required
569 seteuid (euid); 599 seteuid (euid);
570 setegid (egid); 600 setegid (egid);
571 break; 601 break;
572 } 602 }
573# else 603# else
574 switch (mode) 604 switch (action)
575 { 605 {
576 case IGNORE: 606 case IGNORE:
577 setuid (getuid ()); 607 setuid (getuid ());
578 setgid (getgid ()); 608 setgid (getgid ());
579 /* FALLTHROUGH */ 609 /* FALLTHROUGH */
586#endif 616#endif
587} 617}
588 618
589#ifdef UTMP_SUPPORT 619#ifdef UTMP_SUPPORT
590void 620void
591rxvt_term::privileged_utmp (char action) 621rxvt_term::privileged_utmp (rxvt_privaction action)
592{ 622{
593 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
594 action, next_utmp_action, getpid ()));
595 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
596 || (Options & Opt_utmpInhibit) 623 if ((options & Opt_utmpInhibit)
597 || ttydev == NULL || *ttydev == '\0') 624 || !pty.name || !*pty.name)
598 return; 625 return;
599 626
600 privileges (RESTORE); 627 rxvt_privileges (RESTORE);
628
601 if (action == SAVE) 629 if (action == SAVE)
602 {
603 next_utmp_action = RESTORE;
604 makeutent (ttydev, rs[Rs_display_name]); 630 makeutent (pty.name, rs[Rs_display_name]);
605 }
606 else 631 else
607 { /* action == RESTORE */
608 next_utmp_action = IGNORE;
609 cleanutent (); 632 cleanutent ();
610 } 633
611 privileges (IGNORE); 634 rxvt_privileges (IGNORE);
612}
613#endif
614
615#ifndef NO_SETOWNER_TTYDEV
616void
617rxvt_term::privileged_ttydev (char action)
618{
619 D_MAIN ((stderr,
620 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
621 action, next_tty_action, getpid ()));
622 if (next_tty_action != action || (action != SAVE && action != RESTORE)
623 || ttydev == NULL || *ttydev == '\0')
624 return;
625
626 privileges (RESTORE);
627
628 if (action == SAVE)
629 {
630 next_tty_action = RESTORE;
631# ifndef RESET_TTY_TO_COMMON_DEFAULTS
632 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
633 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
634 next_tty_action = IGNORE;
635 else
636# endif
637
638 {
639 chown (ttydev, getuid (), ttygid); /* fail silently */
640 chmod (ttydev, ttymode);
641# ifdef HAVE_REVOKE
642 revoke (ttydev);
643# endif
644
645 }
646 }
647 else
648 { /* action == RESTORE */
649 next_tty_action = IGNORE;
650# ifndef RESET_TTY_TO_COMMON_DEFAULTS
651 chmod (ttydev, ttyfd_stat.st_mode);
652 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
653# else
654 chmod (ttydev,
655 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
656 chown (ttydev, 0, 0);
657# endif
658
659 }
660
661 privileges (IGNORE);
662
663# ifndef RESET_TTY_TO_COMMON_DEFAULTS
664 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
665 action == RESTORE ? "Restoring" : (action ==
666 SAVE ? "Saving" :
667 "UNKNOWN ERROR for"), ttydev,
668 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
669 ttyfd_stat.st_gid));
670# endif
671} 635}
672#endif 636#endif
673 637
674/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
675/* 639/*
740 max_height = MAX_ROWS * TermWin.fheight; 704 max_height = MAX_ROWS * TermWin.fheight;
741 705
742 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
743 707
744 sb_w = mb_h = 0; 708 sb_w = mb_h = 0;
745 window_vt_x = window_vt_y = 0; 709 window_vt_x = window_vt_y = TermWin.int_bwidth;
710
746 if (scrollbar_visible ()) 711 if (scrollbar_visible ())
747 { 712 {
748 sb_w = scrollbar_TotalWidth (); 713 sb_w = scrollbar_TotalWidth ();
749 szHint.base_width += sb_w; 714 szHint.base_width += sb_w;
750 if (! (Options & Opt_scrollBar_right)) 715 if (!(options & Opt_scrollBar_right))
751 window_vt_x = sb_w; 716 window_vt_x += sb_w;
752 } 717 }
718
753 if (menubar_visible ()) 719 if (menubar_visible ())
754 { 720 {
755 mb_h = menuBar_TotalHeight (); 721 mb_h = menuBar_TotalHeight ();
756 szHint.base_height += mb_h; 722 szHint.base_height += mb_h;
757 window_vt_y = mb_h; 723 window_vt_y += mb_h;
758 } 724 }
725
759 szHint.width_inc = TermWin.fwidth; 726 szHint.width_inc = TermWin.fwidth;
760 szHint.height_inc = TermWin.fheight; 727 szHint.height_inc = TermWin.fheight;
761 szHint.min_width = szHint.base_width + szHint.width_inc; 728 szHint.min_width = szHint.base_width + szHint.width_inc;
762 szHint.min_height = szHint.base_height + szHint.height_inc; 729 szHint.min_height = szHint.base_height + szHint.height_inc;
763 730
769 else 736 else
770 { 737 {
771 MIN_IT (TermWin.width, max_width); 738 MIN_IT (TermWin.width, max_width);
772 szHint.width = szHint.base_width + TermWin.width; 739 szHint.width = szHint.base_width + TermWin.width;
773 } 740 }
741
774 if (height && height - szHint.base_height < max_height) 742 if (height && height - szHint.base_height < max_height)
775 { 743 {
776 szHint.height = height; 744 szHint.height = height;
777 TermWin.height = height - szHint.base_height; 745 TermWin.height = height - szHint.base_height;
778 } 746 }
779 else 747 else
780 { 748 {
781 MIN_IT (TermWin.height, max_height); 749 MIN_IT (TermWin.height, max_height);
782 szHint.height = szHint.base_height + TermWin.height; 750 szHint.height = szHint.base_height + TermWin.height;
783 } 751 }
752
784 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 753 if (scrollbar_visible () && (options & Opt_scrollBar_right))
785 window_sb_x = szHint.width - sb_w; 754 window_sb_x = szHint.width - sb_w;
786 755
787 if (recalc_x) 756 if (recalc_x)
788 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
789 - szHint.width - 2 * TermWin.ext_bwidth); 758 - szHint.width - 2 * TermWin.ext_bwidth);
805 * Called after a window size change. 774 * Called after a window size change.
806 */ 775 */
807void 776void
808rxvt_term::tt_winch () 777rxvt_term::tt_winch ()
809{ 778{
779 if (pty.pty < 0)
780 return;
781
810 struct winsize ws; 782 struct winsize ws;
811
812 if (cmd_fd < 0)
813 return;
814 783
815 ws.ws_col = TermWin.ncol; 784 ws.ws_col = TermWin.ncol;
816 ws.ws_row = TermWin.nrow; 785 ws.ws_row = TermWin.nrow;
817 ws.ws_xpixel = ws.ws_ypixel = 0; 786 ws.ws_xpixel = TermWin.width;
818#ifndef DEBUG_SIZE 787 ws.ws_ypixel = TermWin.height;
819 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
820#else 789
821 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 790#if 0
822 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
823# ifdef SIGWINCH
824 else if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
825 kill (cmd_pid, SIGWINCH); 793 kill (cmd_pid, SIGWINCH);
826# endif
827#endif 794#endif
828} 795}
829 796
830/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
831/* rxvt_change_font () - Switch to a new font */ 798/* rxvt_change_font () - Switch to a new font */
863 resize_all_windows (0, 0, 0); 830 resize_all_windows (0, 0, 0);
864 scr_remap_chars (); 831 scr_remap_chars ();
865 scr_touch (true); 832 scr_touch (true);
866 } 833 }
867 834
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
837
868 return true; 838 return true;
869 } 839 }
870 } 840 }
871 841
872 return false; 842 return false;
888 char *name; 858 char *name;
889 859
890 if (!XFetchName (display->display, TermWin.parent[0], &name)) 860 if (!XFetchName (display->display, TermWin.parent[0], &name))
891 name = NULL; 861 name = NULL;
892 862
893 if (name == NULL || STRCMP (name, str)) 863 if (name == NULL || strcmp (name, str))
894#endif 864#endif
895 XStoreName (display->display, TermWin.parent[0], str); 865 XStoreName (display->display, TermWin.parent[0], str);
896 866
897#ifdef SMART_WINDOW_TITLE 867#ifdef SMART_WINDOW_TITLE
898 if (name) 868 if (name)
907 char *name; 877 char *name;
908 878
909 if (!XGetIconName (display->display, TermWin.parent[0], &name)) 879 if (!XGetIconName (display->display, TermWin.parent[0], &name))
910 name = NULL; 880 name = NULL;
911 881
912 if (name == NULL || STRCMP (name, str)) 882 if (name == NULL || strcmp (name, str))
913#endif 883#endif
914 XSetIconName (display->display, TermWin.parent[0], str); 884 XSetIconName (display->display, TermWin.parent[0], str);
915 885
916#ifdef SMART_WINDOW_TITLE 886#ifdef SMART_WINDOW_TITLE
917 if (name) 887 if (name)
935 i = atoi (color); 905 i = atoi (color);
936 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
937 { /* bright colors */ 907 { /* bright colors */
938 i -= 8; 908 i -= 8;
939# ifndef NO_BRIGHTCOLOR 909# ifndef NO_BRIGHTCOLOR
940 PixColors[idx] = PixColors[minBrightCOLOR + i]; 910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941 SET_PIXCOLOR (idx); 911 SET_PIXCOLOR (idx);
942 goto Done; 912 goto Done;
943# endif 913# endif
944 914
945 } 915 }
946 if (i >= 0 && i <= 7) 916 if (i >= 0 && i <= 7)
947 { /* normal colors */ 917 { /* normal colors */
948 PixColors[idx] = PixColors[minCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949 SET_PIXCOLOR (idx); 919 SET_PIXCOLOR (idx);
950 goto Done; 920 goto Done;
951 } 921 }
952 } 922 }
953 923
954 if (!rXParseAllocColor (& xcol, color)) 924 if (!rXParseAllocColor (& xcol, color))
955 return; 925 return;
956 926
957 /* XStoreColor (display->display, XCMAP, XColor*); */ 927 /* XStoreColor (display->display, display->cmap, XColor*); */
958 928
959 /* 929 /*
960 * FIXME: should free colors here, but no idea how to do it so instead, 930 * FIXME: should free colors here, but no idea how to do it so instead,
961 * so just keep gobbling up the colormap 931 * so just keep gobbling up the colormap
962 */ 932 */
963# if 0 933# if 0
964 for (i = Color_Black; i <= Color_White; i++) 934 for (i = Color_Black; i <= Color_White; i++)
965 if (PixColors[idx] == PixColors[i]) 935 if (pix_colors[idx] == pix_colors[i])
966 break; 936 break;
967 if (i > Color_White) 937 if (i > Color_White)
968 { 938 {
969 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 939 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
970 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 940 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
971 DisplayPlanes (display->display, display->screen)); 941 DisplayPlanes (display->display, display->screen));
972 } 942 }
973# endif 943# endif
974 944
975 PixColors[idx] = xcol; 945 pix_colors_focused[idx] = xcol;
976 SET_PIXCOLOR (idx); 946 SET_PIXCOLOR (idx);
977 947
978 /* XSetWindowAttributes attr; */ 948 /* XSetWindowAttributes attr; */
979 /* Cursor cursor; */ 949 /* Cursor cursor; */
980Done: 950Done:
951#ifdef OFF_FOCUS_FADING
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
953#endif
981 if (idx == Color_bg && ! (Options & Opt_transparent)) 954 if (idx == Color_bg && ! (options & Opt_transparent))
982 XSetWindowBackground (display->display, TermWin.vt, 955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
983 PixColors[Color_bg]);
984 956
985 /* handle Color_BD, scrollbar background, etc. */ 957 /* handle Color_BD, scrollbar background, etc. */
986 958
987 set_colorfgbg (); 959 set_colorfgbg ();
988 recolour_cursor (); 960 recolour_cursor ();
996void 968void
997rxvt_term::recolour_cursor () 969rxvt_term::recolour_cursor ()
998{ 970{
999 XColor xcol[2]; 971 XColor xcol[2];
1000 972
1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg]; 973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg];
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg]; 974 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg];
1003 XQueryColors (display->display, XCMAP, xcol, 2); 975 XQueryColors (display->display, display->cmap, xcol, 2);
1004 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1005} 977}
1006 978
1007/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
1008/* 980/*
1015 const char *xpmb = "\0"; 987 const char *xpmb = "\0";
1016 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1017 989
1018 env_colorfgbg = 990 env_colorfgbg =
1019 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 STRCPY (fstr, "default"); 992 strcpy (fstr, "default");
1021 STRCPY (bstr, "default"); 993 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 994 for (i = Color_Black; i <= Color_White; i++)
1023 if (PixColors[Color_fg] == PixColors[i]) 995 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 996 {
1025 sprintf (fstr, "%d", (i - Color_Black)); 997 sprintf (fstr, "%d", (i - Color_Black));
1026 break; 998 break;
1027 } 999 }
1028 for (i = Color_Black; i <= Color_White; i++) 1000 for (i = Color_Black; i <= Color_White; i++)
1029 if (PixColors[Color_bg] == PixColors[i]) 1001 if (pix_colors[Color_bg] == pix_colors[i])
1030 { 1002 {
1031 sprintf (bstr, "%d", (i - Color_Black)); 1003 sprintf (bstr, "%d", (i - Color_Black));
1032#ifdef XPM_BACKGROUND 1004#ifdef XPM_BACKGROUND
1033 xpmb = "default;"; 1005 xpmb = "default;";
1034#endif 1006#endif
1039 1011
1040#ifndef NO_BRIGHTCOLOR 1012#ifndef NO_BRIGHTCOLOR
1041 colorfgbg = DEFAULT_RSTYLE; 1013 colorfgbg = DEFAULT_RSTYLE;
1042 for (i = minCOLOR; i <= maxCOLOR; i++) 1014 for (i = minCOLOR; i <= maxCOLOR; i++)
1043 { 1015 {
1044 if (PixColors[Color_fg] == PixColors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
1045 colorfgbg = SET_FGCOLOR (colorfgbg, i); 1017 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1046 if (PixColors[Color_bg] == PixColors[i]) 1018 if (pix_colors[Color_bg] == pix_colors[i])
1047 colorfgbg = SET_BGCOLOR (colorfgbg, i); 1019 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1048 } 1020 }
1049#endif 1021#endif
1050} 1022}
1051 1023
1079 int old_width = szHint.width, old_height = szHint.height; 1051 int old_width = szHint.width, old_height = szHint.height;
1080#endif 1052#endif
1081 1053
1082 window_calc (width, height); 1054 window_calc (width, height);
1083 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1056
1084 if (!ignoreparent) 1057 if (!ignoreparent)
1085 { 1058 {
1086#ifdef SMART_RESIZE 1059#ifdef SMART_RESIZE
1087 /* 1060 /*
1088 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1061 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
1123 dy /= 2; 1096 dy /= 2;
1124 1097
1125 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1126 szHint.width, szHint.height); 1099 szHint.width, szHint.height);
1127#else 1100#else
1128 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1129 szHint.height);
1130#endif 1102#endif
1131
1132 } 1103 }
1133 1104
1134 fix_screen = (TermWin.ncol != prev_ncol 1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1135 || TermWin.nrow != prev_nrow);
1136 1106
1137 if (fix_screen || width != old_width || height != old_height) 1107 if (fix_screen || width != old_width || height != old_height)
1138 { 1108 {
1139 if (scrollbar_visible ()) 1109 if (scrollbar_visible ())
1140 { 1110 {
1141 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1111 XMoveResizeWindow (display->display, scrollBar.win,
1112 window_sb_x, 0,
1142 0, scrollbar_TotalWidth (), szHint.height); 1113 scrollbar_TotalWidth (), szHint.height);
1143 resize_scrollbar (); 1114 resize_scrollbar ();
1144 } 1115 }
1145 1116
1146 if (menubar_visible ()) 1117 if (menubar_visible ())
1147 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1118 XMoveResizeWindow (display->display, menuBar.win,
1119 window_vt_x, 0,
1148 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1120 TermWin_TotalWidth (), menuBar_TotalHeight ());
1149 1121
1150 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1122 XMoveResizeWindow (display->display, TermWin.vt,
1151 window_vt_y, TermWin_TotalWidth (), 1123 window_vt_x, window_vt_y,
1152 TermWin_TotalHeight ()); 1124 TermWin_TotalWidth (), TermWin_TotalHeight ());
1153 scr_clear (height != old_height); 1125 scr_clear ();
1154#ifdef XPM_BACKGROUND 1126#ifdef XPM_BACKGROUND
1155 resize_pixmap (); 1127 resize_pixmap ();
1156#endif 1128#endif
1157
1158 } 1129 }
1159 1130
1160 if (fix_screen || old_height == 0) 1131 if (fix_screen || old_height == 0)
1161 { 1132 {
1162 int curr_screen = -1; 1133 int curr_screen = -1;
1203 if (width == 0) 1174 if (width == 0)
1204 width = wattr.width - szHint.base_width; 1175 width = wattr.width - szHint.base_width;
1205 if (height == 0) 1176 if (height == 0)
1206 height = wattr.height - szHint.base_height; 1177 height = wattr.height - szHint.base_height;
1207 } 1178 }
1179
1208 if (width != TermWin.width || height != TermWin.height) 1180 if (width != TermWin.width || height != TermWin.height)
1209 { 1181 {
1210 width += szHint.base_width; 1182 width += szHint.base_width;
1211 height += szHint.base_height; 1183 height += szHint.base_height;
1212 resize_all_windows (width, height, 0); 1184 resize_all_windows (width, height, 0);
1217 * - X INPUT METHOD ROUTINES - * 1189 * - X INPUT METHOD ROUTINES - *
1218 * -------------------------------------------------------------------- */ 1190 * -------------------------------------------------------------------- */
1219#ifdef USE_XIM 1191#ifdef USE_XIM
1220 1192
1221void 1193void
1194rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1195{
1196 fg = pix_colors[Color_fg];
1197 bg = pix_colors[Color_bg];
1198}
1199
1200void
1222rxvt_term::im_set_size (XRectangle *size) 1201rxvt_term::im_set_size (XRectangle &size)
1223{ 1202{
1203 // the int_bwidth terms make no sense to me
1224 size->x = TermWin.int_bwidth; 1204 size.x = TermWin.int_bwidth;
1225 size->y = TermWin.int_bwidth; 1205 size.y = TermWin.int_bwidth;
1226 size->width = Width2Pixel (TermWin.ncol); 1206 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1227 size->height = Height2Pixel (TermWin.nrow); 1207 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1228} 1208}
1229 1209
1230void 1210void
1231rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1211rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1212 XRectangle &status_rect,
1213 const XRectangle &needed_rect)
1232{ 1214{
1233 *fg = PixColors[Color_fg]; 1215 preedit_rect.x = needed_rect.width;
1234 *bg = PixColors[Color_bg]; 1216 preedit_rect.y = 0;
1217 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1218 preedit_rect.height = TermWin.fheight;
1219
1220 status_rect.x = 0;
1221 status_rect.y = 0;
1222 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1223 status_rect.height = TermWin.fheight;
1235} 1224}
1236 1225
1237/* Checking whether input method is running. */ 1226/* Checking whether input method is running. */
1238bool 1227bool
1239rxvt_term::IMisRunning () 1228rxvt_term::IMisRunning ()
1240{ 1229{
1241 char *p; 1230 char *p;
1242 Atom atom; 1231 Atom atom;
1243 Window win; 1232 Window win;
1244 char server[IMBUFSIZ]; 1233 char server[IMBUFSIZ];
1245 1234
1246 /* get current locale modifier */ 1235 /* get current locale modifier */
1247 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1236 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1248 { 1237 {
1249 STRCPY (server, "@server="); 1238 strcpy (server, "@server=");
1250 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1239 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1240
1251 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1241 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1252 *p = '\0'; 1242 *p = '\0';
1253 1243
1254 atom = XInternAtom (display->display, server, False); 1244 atom = XInternAtom (display->display, server, False);
1255 win = XGetSelectionOwner (display->display, atom); 1245 win = XGetSelectionOwner (display->display, atom);
1246
1256 if (win != None) 1247 if (win != None)
1257 return True; 1248 return True;
1258 } 1249 }
1250
1259 return False; 1251 return False;
1260} 1252}
1261 1253
1262void 1254void
1263rxvt_term::IMSendSpot () 1255rxvt_term::IMSendSpot ()
1264{ 1256{
1265 XPoint spot; 1257 XPoint spot;
1266 XVaNestedList preedit_attr; 1258 XVaNestedList preedit_attr;
1267 1259
1268 if (Input_Context == NULL 1260 if (!Input_Context
1261 || !TermWin.focus
1269 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1262 || !(input_style & XIMPreeditPosition)
1263#if 0
1270 || ! (event_type == KeyPress 1264 || !(event_type == KeyPress
1271 || event_type == Expose 1265 || event_type == Expose
1272 || event_type == NoExpose 1266 || event_type == NoExpose
1273 || event_type == SelectionNotify 1267 || event_type == SelectionNotify
1274 || event_type == ButtonRelease || event_type == FocusIn) 1268 || event_type == ButtonRelease || event_type == FocusIn)
1269#endif
1275 || !IMisRunning ()) 1270 || !IMisRunning ())
1276 return; 1271 return;
1277 1272
1278 im_set_position (&spot); 1273 im_set_position (spot);
1279 1274
1280 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1281 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1282 XFree (preedit_attr); 1277 XFree (preedit_attr);
1283} 1278}
1284 1279
1285void 1280void
1286rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1287 XRectangle * needed_rect)
1288{
1289 int mbh, vtx = 0;
1290
1291 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1292 vtx = scrollbar_TotalWidth ();
1293
1294 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1295 mbh -= TermWin.lineSpace;
1296
1297 preedit_rect->x = needed_rect->width + vtx;
1298 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1299
1300 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1301 preedit_rect->height = Height2Pixel (1);
1302
1303 status_rect->x = vtx;
1304 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1305
1306 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1307 status_rect->height = Height2Pixel (1);
1308}
1309
1310void
1311rxvt_term::im_destroy () 1281rxvt_term::im_destroy ()
1312{ 1282{
1313 if (Input_Context) 1283 if (Input_Context)
1314 { 1284 {
1315 XDestroyIC (Input_Context); 1285 XDestroyIC (Input_Context);
1316 Input_Context = NULL; 1286 Input_Context = 0;
1317 } 1287 }
1318 1288
1319 if (input_method) 1289 if (input_method)
1320 { 1290 {
1321 display->put_xim (input_method); 1291 display->put_xim (input_method);
1328 * open a suitable preedit type 1298 * open a suitable preedit type
1329 */ 1299 */
1330bool 1300bool
1331rxvt_term::IM_get_IC (const char *modifiers) 1301rxvt_term::IM_get_IC (const char *modifiers)
1332{ 1302{
1333 int i, j, found; 1303 int i, j, found;
1334 XIM xim; 1304 XIM xim;
1335 XPoint spot; 1305 XPoint spot;
1336 XRectangle rect, status_rect, needed_rect; 1306 XRectangle rect, status_rect, needed_rect;
1337 unsigned long fg, bg; 1307 unsigned long fg, bg;
1338 const char *p; 1308 const char *p;
1339 char **s; 1309 char **s;
1340 XIMStyles *xim_styles; 1310 XIMStyles *xim_styles;
1341 XVaNestedList preedit_attr, status_attr;
1342 1311
1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1312 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1344 return false; 1313 return false;
1345 1314
1346 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1315 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1352 1321
1353 xim_styles = NULL; 1322 xim_styles = NULL;
1354 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1355 || !xim_styles || !xim_styles->count_styles) 1324 || !xim_styles || !xim_styles->count_styles)
1356 { 1325 {
1357 display->put_xim (input_method); 1326 im_destroy ();
1358 return false; 1327 return false;
1359 } 1328 }
1360 1329
1361 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1362 s = rxvt_splitcommastring (p); 1331 s = rxvt_splitcommastring (p);
1332
1363 for (i = found = 0; !found && s[i]; i++) 1333 for (i = found = 0; !found && s[i]; i++)
1364 { 1334 {
1365 if (!STRCMP (s[i], "OverTheSpot")) 1335 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1336 input_style = (XIMPreeditPosition | XIMStatusNothing);
1367 else if (!STRCMP (s[i], "OffTheSpot")) 1337 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1338 input_style = (XIMPreeditArea | XIMStatusArea);
1369 else if (!STRCMP (s[i], "Root")) 1339 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1340 input_style = (XIMPreeditNothing | XIMStatusNothing);
1371 1341
1372 for (j = 0; j < xim_styles->count_styles; j++) 1342 for (j = 0; j < xim_styles->count_styles; j++)
1373 if (input_style == xim_styles->supported_styles[j]) 1343 if (input_style == xim_styles->supported_styles[j])
1374 { 1344 {
1383 free (s); 1353 free (s);
1384 XFree (xim_styles); 1354 XFree (xim_styles);
1385 1355
1386 if (!found) 1356 if (!found)
1387 { 1357 {
1388 display->put_xim (input_method); 1358 im_destroy ();
1389 return false; 1359 return false;
1390 } 1360 }
1391 1361
1392 preedit_attr = status_attr = NULL; 1362 XFontSet fs = 0;
1363 XVaNestedList preedit_attr = 0, status_attr = 0;
1364
1365 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1366 {
1367 // fake us a font-set, please
1368 char **missing_charset_list;
1369 int missing_charset_count;
1370 char *def_string;
1371 char pat[512];
1372
1373 sprintf (pat,
1374 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1375 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1376 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1377 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1378 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1379 "*",
1380 TermWin.fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2);
1383
1384 fs = XCreateFontSet (display->display, pat,
1385 &missing_charset_list, &missing_charset_count, &def_string);
1386
1387 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list);
1389
1390 if (!fs)
1391 {
1392 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1393 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1394 }
1395 }
1393 1396
1394 if (input_style & XIMPreeditPosition) 1397 if (input_style & XIMPreeditPosition)
1395 { 1398 {
1396 im_set_size (&rect); 1399 im_set_size (rect);
1397 im_set_position (&spot); 1400 im_set_position (spot);
1398 im_set_color (&fg, &bg); 1401 im_set_color (fg, bg);
1399 1402
1400 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1403 preedit_attr = XVaCreateNestedList (0,
1404 XNForeground, fg,
1405 XNBackground, bg,
1406 XNArea, &rect,
1401 XNSpotLocation, &spot, 1407 XNSpotLocation, &spot,
1402 XNForeground, fg, XNBackground, bg,
1403 //XNFontSet, TermWin.fontset, 1408 XNFontSet, fs,
1404 NULL); 1409 NULL);
1405 } 1410 }
1406 else if (input_style & XIMPreeditArea) 1411 else if (input_style & XIMPreeditArea)
1407 { 1412 {
1408 im_set_color (&fg, &bg); 1413 im_set_color (fg, bg);
1409 1414
1410 /* 1415 /*
1411 * The necessary width of preedit area is unknown 1416 * The necessary width of preedit area is unknown
1412 * until create input context. 1417 * until create input context.
1413 */ 1418 */
1414 needed_rect.width = 0; 1419 needed_rect.width = 0;
1415
1416 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1420 im_set_preedit_area (rect, status_rect, needed_rect);
1417 1421
1418 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1422 preedit_attr = XVaCreateNestedList (0,
1423 XNForeground, fg,
1419 XNForeground, fg, XNBackground, bg, 1424 XNBackground, bg,
1425 XNArea, &rect,
1426 XNFontSet, fs,
1427 NULL);
1428 status_attr = XVaCreateNestedList (0,
1429 XNForeground, fg,
1430 XNBackground, bg,
1431 XNArea, &status_rect,
1420 //XNFontSet, TermWin.fontset, 1432 XNFontSet, fs,
1421 NULL); 1433 NULL);
1422 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1423 XNForeground, fg, XNBackground, bg,
1424 //XNFontSet, TermWin.fontset,
1425 NULL);
1426 } 1434 }
1427 1435
1428 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1436 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style,
1429 XNClientWindow, TermWin.parent[0], 1438 XNClientWindow, TermWin.vt,
1430 XNFocusWindow, TermWin.parent[0], 1439 XNFocusWindow, TermWin.parent[0],
1431 preedit_attr ? XNPreeditAttributes : NULL, 1440 preedit_attr ? XNPreeditAttributes : NULL,
1432 preedit_attr, 1441 preedit_attr,
1433 status_attr ? XNStatusAttributes : NULL, 1442 status_attr ? XNStatusAttributes : NULL,
1434 status_attr, NULL); 1443 status_attr, NULL);
1444
1435 if (preedit_attr) XFree (preedit_attr); 1445 if (preedit_attr) XFree (preedit_attr);
1436 if (status_attr) XFree (status_attr); 1446 if (status_attr) XFree (status_attr);
1447 if (fs) XFreeFontSet (display->display, fs);
1437 1448
1438 if (Input_Context == NULL) 1449 if (Input_Context == NULL)
1439 { 1450 {
1440 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1451 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1441 display->put_xim (input_method); 1452 im_destroy ();
1442 return false; 1453 return false;
1443 } 1454 }
1444 1455
1445 if (input_style & XIMPreeditArea) 1456 if (input_style & XIMPreeditArea)
1446 IMSetStatusPosition (); 1457 IMSetStatusPosition ();
1476 s = rxvt_splitcommastring (p); 1487 s = rxvt_splitcommastring (p);
1477 for (i = 0; s[i]; i++) 1488 for (i = 0; s[i]; i++)
1478 { 1489 {
1479 if (*s[i]) 1490 if (*s[i])
1480 { 1491 {
1481 STRCPY (buf, "@im="); 1492 strcpy (buf, "@im=");
1482 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1493 strncat (buf, s[i], IMBUFSIZ - 5);
1483 if (IM_get_IC (buf)) 1494 if (IM_get_IC (buf))
1484 { 1495 {
1485 found = true; 1496 found = true;
1486 break; 1497 break;
1487 } 1498 }
1511} 1522}
1512 1523
1513void 1524void
1514rxvt_term::IMSetStatusPosition () 1525rxvt_term::IMSetStatusPosition ()
1515{ 1526{
1516 XRectangle preedit_rect, status_rect, *needed_rect; 1527 XRectangle preedit_rect, status_rect, *needed_rect;
1517 XVaNestedList preedit_attr, status_attr; 1528 XVaNestedList preedit_attr, status_attr;
1518 1529
1519 if (Input_Context == NULL 1530 if (!Input_Context
1531 || !TermWin.focus
1520 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1532 || !(input_style & XIMPreeditArea)
1521 || !IMisRunning ()) 1533 || !IMisRunning ())
1522 return; 1534 return;
1523 1535
1524 /* Getting the necessary width of preedit area */ 1536 /* Getting the necessary width of preedit area */
1525 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1537 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1526 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1538 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1527 XFree (status_attr); 1539 XFree (status_attr);
1528 1540
1529 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1541 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1542 XFree (needed_rect);
1530 1543
1531 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1544 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1532 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1545 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1533 1546
1534 XSetICValues (Input_Context, 1547 XSetICValues (Input_Context,
1535 XNPreeditAttributes, preedit_attr, 1548 XNPreeditAttributes, preedit_attr,
1536 XNStatusAttributes, status_attr, NULL); 1549 XNStatusAttributes, status_attr, NULL);
1537 1550
1538 XFree (preedit_attr); 1551 XFree (preedit_attr);
1539 XFree (status_attr); 1552 XFree (status_attr);
1540} 1553}
1541#endif /* USE_XIM */ 1554#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines