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.67 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.120 by root, Mon Dec 13 19:16:36 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines