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.70 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.132 by root, Thu Feb 3 07:18:30 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines