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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines