ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.25 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.26 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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