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.30 by pcg, Thu Feb 12 01:53:25 2004 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
79 vt_ev (this, &rxvt_term::x_cb), 80 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 81#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 82 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 83#endif
83#ifdef MENUBAR 84#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 85 menubar_ev (this, &rxvt_term::x_cb),
85#endif 86#endif
86#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 89#endif
89#ifdef TEXT_BLINK 90#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 92#endif
92#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
94#endif 98#endif
95 check_ev (this, &rxvt_term::check_cb), 99 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 102 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 103{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 105}
105 106
106rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
107{ 108{
108 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
109 close (cmd_fd); 110 close (cmd_fd);
110 111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123 if (TermWin.parent[0])
124 XDestroyWindow (display->display, TermWin.parent[0]);
125#if defined(MENUBAR) && (MENUBAR_MAX > 1)
126 if (menuBar.win)
127 XDestroyWindow (display->display, menuBar.win);
128 delete menuBar.drawable;
129#endif
130 }
131
132 // TODO: free pixcolours, colours should become part of rxvt_display
133
134 delete PixColors;
135
136 displays.put (display);
137
111 scr_release (); 138 scr_release ();
112 139
140 free (env_windowid);
141 free (env_display);
142 free (env_term);
143 free (env_colorfgbg);
113 free (locale); 144 free (locale);
114 free (codeset); 145 free (codeset);
115 146
116#ifndef NO_SETOWNER_TTYDEV 147 delete envv;
117 privileged_ttydev (RESTORE); 148 delete argv;
118#endif
119#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE);
121#endif
122
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126
127 displays.put (display);
128} 149}
129 150
130void 151void
131rxvt_term::destroy () 152rxvt_term::destroy ()
132{ 153{
133 if (display) 154 if (display)
134 { 155 {
135 if (TermWin.parent[0]) 156 rootwin_ev.stop (display);
136 XDestroyWindow (display->display, TermWin.parent[0]);
137
138 termwin_ev.stop (display); 157 termwin_ev.stop (display);
139 vt_ev.stop (display); 158 vt_ev.stop (display);
140
141#ifdef USE_XIM 159#ifdef USE_XIM
142 im_destroy (); 160 im_destroy ();
143 im_ev.stop (display); 161 im_ev.stop (display);
144#endif 162#endif
145#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
… …
172 190
173 delete this; 191 delete this;
174} 192}
175 193
176/*----------------------------------------------------------------------*/ 194/*----------------------------------------------------------------------*/
177/* rxvt_init() */ 195/* rxvt_init () */
178/* LIBPROTO */ 196/* LIBPROTO */
179rxvt_t 197rxvt_t
180rxvt_init (int argc, const char *const *argv) 198rxvt_init (int argc, const char *const *argv)
181{ 199{
182 SET_R (new rxvt_term); 200 SET_R (new rxvt_term);
… …
188 } 206 }
189 207
190 return GET_R; 208 return GET_R;
191} 209}
192 210
193static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event); 211static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
194 212
195void 213void
196rxvt_init_signals () 214rxvt_init_signals ()
197{ 215{
198 /* install exit handler for cleanup */ 216 /* install exit handler for cleanup */
199#if 0 217#if 0
200#ifdef HAVE_ATEXIT 218#ifdef HAVE_ATEXIT
201 atexit(rxvt_clean_exit); 219 atexit (rxvt_clean_exit);
202#else 220#else
203#endif 221#endif
204#endif 222#endif
205 223
206 struct sigaction sa; 224 struct sigaction sa;
… …
238 256
239 const char **cmd_argv = init_resources (argc, argv); 257 const char **cmd_argv = init_resources (argc, argv);
240 258
241 set_locale (""); 259 set_locale ("");
242 260
243#if (MENUBAR_MAX) 261#if MENUBAR_MAX
244 menubar_read (rs[Rs_menu]); 262 menubar_read (rs[Rs_menu]);
245#endif 263#endif
246#ifdef HAVE_SCROLLBARS 264#ifdef HAVE_SCROLLBARS
247 if (Options & Opt_scrollBar) 265 if (Options & Opt_scrollBar)
248 scrollBar.setIdle (); /* set existence for size calculations */ 266 scrollBar.setIdle (); /* set existence for size calculations */
… …
251 create_windows (argc, argv); 269 create_windows (argc, argv);
252 270
253 init_xlocale (); 271 init_xlocale ();
254 272
255 scr_reset (); /* initialize screen */ 273 scr_reset (); /* initialize screen */
256#ifdef RXVT_GRAPHICS
257 Gr_reset (); /* reset graphics */
258#endif
259 274
260#if 0 275#if 0
261#ifdef DEBUG_X
262 XSynchronize(display->display, True); 276 XSynchronize (display->display, True);
263#endif
264#endif 277#endif
265 278
266#ifdef HAVE_SCROLLBARS 279#ifdef HAVE_SCROLLBARS
267 if (Options & Opt_scrollBar) 280 if (Options & Opt_scrollBar)
268 resize_scrollbar (); /* create and map scrollbar */ 281 resize_scrollbar (); /* create and map scrollbar */
269#endif 282#endif
270#if (MENUBAR_MAX) 283#if (MENUBAR_MAX)
271 if (menubar_visible(r)) 284 if (menubar_visible ())
272 XMapWindow (display->display, menuBar.win); 285 XMapWindow (display->display, menuBar.win);
273#endif 286#endif
274#ifdef TRANSPARENT 287#ifdef TRANSPARENT
275 if (Options & Opt_transparent) 288 if (Options & Opt_transparent)
276 { 289 {
… …
282 rootwin_ev.start (display, display->root); 295 rootwin_ev.start (display, display->root);
283 296
284 XMapWindow (display->display, TermWin.vt); 297 XMapWindow (display->display, TermWin.vt);
285 XMapWindow (display->display, TermWin.parent[0]); 298 XMapWindow (display->display, TermWin.parent[0]);
286 299
287 init_env ();
288 init_command (cmd_argv); 300 init_command (cmd_argv);
289 301
290 pty_ev.start (cmd_fd, EVENT_READ); 302 pty_ev.start (cmd_fd, EVENT_READ);
291 303
292 check_ev.start (); 304 check_ev.start ();
… …
301 * Catch a SIGCHLD signal and exit if the direct child has died 313 * Catch a SIGCHLD signal and exit if the direct child has died
302 */ 314 */
303/* ARGSUSED */ 315/* ARGSUSED */
304/* EXTPROTO */ 316/* EXTPROTO */
305RETSIGTYPE 317RETSIGTYPE
306rxvt_Child_signal(int sig __attribute__ ((unused))) 318rxvt_Child_signal (int sig __attribute__ ((unused)))
307{ 319{
308 int pid, save_errno = errno; 320 int pid, save_errno = errno;
309 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 321 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
310 ; 322 ;
311 errno = save_errno; 323 errno = save_errno;
… …
319/* 331/*
320 * Catch a fatal signal and tidy up before quitting 332 * Catch a fatal signal and tidy up before quitting
321 */ 333 */
322/* EXTPROTO */ 334/* EXTPROTO */
323RETSIGTYPE 335RETSIGTYPE
324rxvt_Exit_signal(int sig) 336rxvt_Exit_signal (int sig)
325{ 337{
326 signal (sig, SIG_DFL); 338 signal (sig, SIG_DFL);
327#ifdef DEBUG_CMD 339#ifdef DEBUG_CMD
328 rxvt_print_error ("signal %d", sig); 340 rxvt_print_error ("signal %d", sig);
329#endif 341#endif
330 rxvt_clean_exit(); 342 rxvt_clean_exit ();
331 kill (getpid (), sig); 343 kill (getpid (), sig);
332} 344}
333 345
334/* INTPROTO */ 346/* INTPROTO */
335int 347int
… …
363/* ------------------------------------------------------------------------- * 375/* ------------------------------------------------------------------------- *
364 * MEMORY ALLOCATION WRAPPERS * 376 * MEMORY ALLOCATION WRAPPERS *
365 * ------------------------------------------------------------------------- */ 377 * ------------------------------------------------------------------------- */
366/* EXTPROTO */ 378/* EXTPROTO */
367void * 379void *
368rxvt_malloc(size_t size) 380rxvt_malloc (size_t size)
369{ 381{
370 void *p; 382 void *p;
371 383
372 p = malloc(size); 384 p = malloc (size);
373 if (p) 385 if (p)
374 return p; 386 return p;
375 387
376 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
377 rxvt_clean_exit(); 389 rxvt_clean_exit ();
378 exit(EXIT_FAILURE); 390 exit (EXIT_FAILURE);
379 /* NOTREACHED */ 391 /* NOTREACHED */
380} 392}
381 393
382/* EXTPROTO */ 394/* EXTPROTO */
383void * 395void *
384rxvt_calloc(size_t number, size_t size) 396rxvt_calloc (size_t number, size_t size)
385{ 397{
386 void *p; 398 void *p;
387 399
388 p = calloc(number, size); 400 p = calloc (number, size);
389 if (p) 401 if (p)
390 return p; 402 return p;
391 403
392 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
393 rxvt_clean_exit(); 405 rxvt_clean_exit ();
394 exit(EXIT_FAILURE); 406 exit (EXIT_FAILURE);
395 /* NOTREACHED */ 407 /* NOTREACHED */
396} 408}
397 409
398/* EXTPROTO */ 410/* EXTPROTO */
399void * 411void *
400rxvt_realloc(void *ptr, size_t size) 412rxvt_realloc (void *ptr, size_t size)
401{ 413{
402 void *p; 414 void *p;
403 415
404 if (ptr) 416 if (ptr)
405 p = realloc(ptr, size); 417 p = realloc (ptr, size);
406 else 418 else
407 p = malloc(size); 419 p = malloc (size);
408 if (p) 420 if (p)
409 return p; 421 return p;
410 422
411 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
412 rxvt_clean_exit(); 424 rxvt_clean_exit ();
413 exit(EXIT_FAILURE); 425 exit (EXIT_FAILURE);
414 /* NOTREACHED */ 426 /* NOTREACHED */
415} 427}
416 428
417/* ------------------------------------------------------------------------- * 429/* ------------------------------------------------------------------------- *
418 * PRIVILEGED OPERATIONS * 430 * PRIVILEGED OPERATIONS *
… …
421void 433void
422rxvt_term::privileges (int mode) 434rxvt_term::privileges (int mode)
423{ 435{
424#if ! defined(__CYGWIN32__) 436#if ! defined(__CYGWIN32__)
425# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 437# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
426 /* setreuid() is the poor man's setuid(), seteuid() */ 438 /* setreuid () is the poor man's setuid (), seteuid () */
427# define seteuid(a) setreuid(-1, (a)) 439# define seteuid(a) setreuid(-1, (a))
428# define setegid(a) setregid(-1, (a)) 440# define setegid(a) setregid(-1, (a))
429# define HAVE_SETEUID 441# define HAVE_SETEUID
430# endif 442# endif
431# ifdef HAVE_SETEUID 443# ifdef HAVE_SETEUID
… …
434 case IGNORE: 446 case IGNORE:
435 /* 447 /*
436 * change effective uid/gid - not real uid/gid - so we can switch 448 * change effective uid/gid - not real uid/gid - so we can switch
437 * back to root later, as required 449 * back to root later, as required
438 */ 450 */
439 seteuid(getuid()); 451 seteuid (getuid ());
440 setegid(getgid()); 452 setegid (getgid ());
441 break; 453 break;
442 case SAVE: 454 case SAVE:
443 euid = geteuid(); 455 euid = geteuid ();
444 egid = getegid(); 456 egid = getegid ();
445 break; 457 break;
446 case RESTORE: 458 case RESTORE:
447 seteuid(euid); 459 seteuid (euid);
448 setegid(egid); 460 setegid (egid);
449 break; 461 break;
450 } 462 }
451# else 463# else
452 switch (mode) 464 switch (mode)
453 { 465 {
454 case IGNORE: 466 case IGNORE:
455 setuid(getuid()); 467 setuid (getuid ());
456 setgid(getgid()); 468 setgid (getgid ());
457 /* FALLTHROUGH */ 469 /* FALLTHROUGH */
458 case SAVE: 470 case SAVE:
459 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
460 case RESTORE: 472 case RESTORE:
461 break; 473 break;
… …
466 478
467#ifdef UTMP_SUPPORT 479#ifdef UTMP_SUPPORT
468void 480void
469rxvt_term::privileged_utmp (char action) 481rxvt_term::privileged_utmp (char action)
470{ 482{
471 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 483 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
472 action, next_utmp_action, getpid())); 484 action, next_utmp_action, getpid ()));
473 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 485 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
474 || (Options & Opt_utmpInhibit) 486 || (Options & Opt_utmpInhibit)
475 || ttydev == NULL || *ttydev == '\0') 487 || ttydev == NULL || *ttydev == '\0')
476 return; 488 return;
477 489
… …
492 504
493#ifndef NO_SETOWNER_TTYDEV 505#ifndef NO_SETOWNER_TTYDEV
494void 506void
495rxvt_term::privileged_ttydev (char action) 507rxvt_term::privileged_ttydev (char action)
496{ 508{
497 D_MAIN((stderr, 509 D_MAIN ((stderr,
498 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 510 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
499 action, next_tty_action, getpid())); 511 action, next_tty_action, getpid ()));
500 if (next_tty_action != action || (action != SAVE && action != RESTORE) 512 if (next_tty_action != action || (action != SAVE && action != RESTORE)
501 || ttydev == NULL || *ttydev == '\0') 513 || ttydev == NULL || *ttydev == '\0')
502 return; 514 return;
503 515
504 privileges (RESTORE); 516 privileges (RESTORE);
505 517
506 if (action == SAVE) 518 if (action == SAVE)
507 { 519 {
508 next_tty_action = RESTORE; 520 next_tty_action = RESTORE;
509# ifndef RESET_TTY_TO_COMMON_DEFAULTS 521# ifndef RESET_TTY_TO_COMMON_DEFAULTS
510 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 522 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
511 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 523 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
512 next_tty_action = IGNORE; 524 next_tty_action = IGNORE;
513 else 525 else
514# endif 526# endif
515 527
516 { 528 {
517 chown(ttydev, getuid(), ttygid); /* fail silently */ 529 chown (ttydev, getuid (), ttygid); /* fail silently */
518 chmod(ttydev, ttymode); 530 chmod (ttydev, ttymode);
519# ifdef HAVE_REVOKE 531# ifdef HAVE_REVOKE
520 revoke(ttydev); 532 revoke (ttydev);
521# endif 533# endif
522 534
523 } 535 }
524 } 536 }
525 else 537 else
526 { /* action == RESTORE */ 538 { /* action == RESTORE */
527 next_tty_action = IGNORE; 539 next_tty_action = IGNORE;
528# ifndef RESET_TTY_TO_COMMON_DEFAULTS 540# ifndef RESET_TTY_TO_COMMON_DEFAULTS
529 chmod(ttydev, ttyfd_stat.st_mode); 541 chmod (ttydev, ttyfd_stat.st_mode);
530 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 542 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
531# else 543# else
532 chmod(ttydev, 544 chmod (ttydev,
533 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 545 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
534 chown(ttydev, 0, 0); 546 chown (ttydev, 0, 0);
535# endif 547# endif
536 548
537 } 549 }
538 550
539 privileges (IGNORE); 551 privileges (IGNORE);
540 552
541# ifndef RESET_TTY_TO_COMMON_DEFAULTS 553# ifndef RESET_TTY_TO_COMMON_DEFAULTS
542 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 554 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
543 action == RESTORE ? "Restoring" : (action == 555 action == RESTORE ? "Restoring" : (action ==
544 SAVE ? "Saving" : 556 SAVE ? "Saving" :
545 "UNKNOWN ERROR for"), ttydev, 557 "UNKNOWN ERROR for"), ttydev,
546 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 558 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
547 ttyfd_stat.st_gid)); 559 ttyfd_stat.st_gid));
… …
560 short recalc_x, recalc_y; 572 short recalc_x, recalc_y;
561 int x, y, sb_w, mb_h, flags; 573 int x, y, sb_w, mb_h, flags;
562 unsigned int w, h; 574 unsigned int w, h;
563 unsigned int max_width, max_height; 575 unsigned int max_width, max_height;
564 576
565 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 577 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
566 TermWin.ncol, TermWin.nrow, szHint.width, 578 TermWin.ncol, TermWin.nrow, szHint.width,
567 szHint.height)); 579 szHint.height));
568 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 580 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
569 szHint.win_gravity = NorthWestGravity; 581 szHint.win_gravity = NorthWestGravity;
570 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 582 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
573 flags = 0; 585 flags = 0;
574 if (!parsed_geometry) 586 if (!parsed_geometry)
575 { 587 {
576 parsed_geometry = 1; 588 parsed_geometry = 1;
577 if (rs[Rs_geometry]) 589 if (rs[Rs_geometry])
578 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 590 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
579 if (flags & WidthValue) 591 if (flags & WidthValue)
580 { 592 {
581 TermWin.ncol = BOUND_POSITIVE_INT16(w); 593 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
582 szHint.flags |= USSize; 594 szHint.flags |= USSize;
583 } 595 }
584 if (flags & HeightValue) 596 if (flags & HeightValue)
585 { 597 {
586 TermWin.nrow = BOUND_POSITIVE_INT16(h); 598 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
587 szHint.flags |= USSize; 599 szHint.flags |= USSize;
588 } 600 }
589 if (flags & XValue) 601 if (flags & XValue)
590 { 602 {
591 szHint.x = x; 603 szHint.x = x;
… …
620 632
621 sb_w = mb_h = 0; 633 sb_w = mb_h = 0;
622 window_vt_x = window_vt_y = 0; 634 window_vt_x = window_vt_y = 0;
623 if (scrollbar_visible ()) 635 if (scrollbar_visible ())
624 { 636 {
625 sb_w = scrollbar_TotalWidth(); 637 sb_w = scrollbar_TotalWidth ();
626 szHint.base_width += sb_w; 638 szHint.base_width += sb_w;
627 if (!(Options & Opt_scrollBar_right)) 639 if (! (Options & Opt_scrollBar_right))
628 window_vt_x = sb_w; 640 window_vt_x = sb_w;
629 } 641 }
630 if (menubar_visible ()) 642 if (menubar_visible ())
631 { 643 {
632 mb_h = menuBar_TotalHeight(); 644 mb_h = menuBar_TotalHeight ();
633 szHint.base_height += mb_h; 645 szHint.base_height += mb_h;
634 window_vt_y = mb_h; 646 window_vt_y = mb_h;
635 } 647 }
636 szHint.width_inc = TermWin.fwidth; 648 szHint.width_inc = TermWin.fwidth;
637 szHint.height_inc = TermWin.fheight; 649 szHint.height_inc = TermWin.fheight;
… …
643 szHint.width = width; 655 szHint.width = width;
644 TermWin.width = width - szHint.base_width; 656 TermWin.width = width - szHint.base_width;
645 } 657 }
646 else 658 else
647 { 659 {
648 MIN_IT(TermWin.width, max_width); 660 MIN_IT (TermWin.width, max_width);
649 szHint.width = szHint.base_width + TermWin.width; 661 szHint.width = szHint.base_width + TermWin.width;
650 } 662 }
651 if (height && height - szHint.base_height < max_height) 663 if (height && height - szHint.base_height < max_height)
652 { 664 {
653 szHint.height = height; 665 szHint.height = height;
654 TermWin.height = height - szHint.base_height; 666 TermWin.height = height - szHint.base_height;
655 } 667 }
656 else 668 else
657 { 669 {
658 MIN_IT(TermWin.height, max_height); 670 MIN_IT (TermWin.height, max_height);
659 szHint.height = szHint.base_height + TermWin.height; 671 szHint.height = szHint.base_height + TermWin.height;
660 } 672 }
661 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 673 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
662 window_sb_x = szHint.width - sb_w; 674 window_sb_x = szHint.width - sb_w;
663 675
… …
668 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 680 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
669 - szHint.height - 2 * TermWin.ext_bwidth); 681 - szHint.height - 2 * TermWin.ext_bwidth);
670 682
671 TermWin.ncol = TermWin.width / TermWin.fwidth; 683 TermWin.ncol = TermWin.width / TermWin.fwidth;
672 TermWin.nrow = TermWin.height / TermWin.fheight; 684 TermWin.nrow = TermWin.height / TermWin.fheight;
673 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 685 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
674 TermWin.ncol, TermWin.nrow, szHint.width, 686 TermWin.ncol, TermWin.nrow, szHint.width,
675 szHint.height)); 687 szHint.height));
676 return; 688 return;
677} 689}
678 690
… …
694 ws.ws_xpixel = ws.ws_ypixel = 0; 706 ws.ws_xpixel = ws.ws_ypixel = 0;
695#ifndef DEBUG_SIZE 707#ifndef DEBUG_SIZE
696 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 708 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
697#else 709#else
698 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 710 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
699 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 711 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
700# ifdef SIGWINCH 712# ifdef SIGWINCH
701 else if (cmd_pid) /* force through to the command */ 713 else if (cmd_pid) /* force through to the command */
702 kill (cmd_pid, SIGWINCH); 714 kill (cmd_pid, SIGWINCH);
703# endif 715# endif
704#endif 716#endif
705} 717}
706 718
707/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
708/* rxvt_change_font() - Switch to a new font */ 720/* rxvt_change_font () - Switch to a new font */
709/* 721/*
710 * init = 1 - initialize 722 * init = 1 - initialize
711 * 723 *
712 * fontname == FONT_UP - switch to bigger font 724 * fontname == FONT_UP - switch to bigger font
713 * fontname == FONT_DN - switch to smaller font 725 * fontname == FONT_DN - switch to smaller font
714 */ 726 */
715void 727bool
716rxvt_term::change_font (int init, const char *fontname) 728rxvt_term::change_font (const char *fontname)
717{} 729{
730 if (fontname == FONT_UP)
731 {
732 // TODO
733 }
734 else if (fontname == FONT_DN)
735 {
736 // TODO
737 }
738 else
739 {
740 rxvt_fontset *fs = new rxvt_fontset (this);
718 741
719void 742 if (fs && fs->populate (fontname))
743 {
744 delete TermWin.fontset;
745 TermWin.fontset = fs;
746 TermWin.fwidth = fs->base_font ()->width;
747 TermWin.fheight = fs->base_font ()->height;
748 TermWin.fbase = fs->base_font ()->ascent;
749
750 // TODO: screen needs to be told about new fonts
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
720rxvt_term::font_up_down (int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
721{} 768{
769 return false;
770}
722 771
723/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
724/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
725/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
726void 775void
727rxvt_term::set_title (const char *str) 776rxvt_term::set_title (const char *str)
728{ 777{
729#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
730 XStoreName(display->display, TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
731#else 780#else
732 char *name; 781 char *name;
733 782
734 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
735 name = NULL; 784 name = NULL;
736 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
737 XStoreName(display->display, TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
738 if (name) 787 if (name)
739 XFree(name); 788 XFree (name);
740#endif 789#endif
741} 790}
742 791
743void 792void
744rxvt_term::set_iconName (const char *str) 793rxvt_term::set_iconName (const char *str)
745{ 794{
746#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
747 XSetIconName(display->display, TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
748#else 797#else
749 char *name; 798 char *name;
750 799
751 if (XGetIconName(display->display, TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
752 name = NULL; 801 name = NULL;
753 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
754 XSetIconName(display->display, TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
755 if (name) 804 if (name)
756 XFree(name); 805 XFree (name);
757#endif 806#endif
758} 807}
759 808
760#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
761void 810void
… …
766 815
767 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
768 return; 817 return;
769 818
770 /* handle color aliases */ 819 /* handle color aliases */
771 if (isdigit(*color)) 820 if (isdigit (*color))
772 { 821 {
773 i = atoi(color); 822 i = atoi (color);
774 if (i >= 8 && i <= 15) 823 if (i >= 8 && i <= 15)
775 { /* bright colors */ 824 { /* bright colors */
776 i -= 8; 825 i -= 8;
777# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
778 PixColors[idx] = PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
779 SET_PIXCOLOR(idx); 828 SET_PIXCOLOR (idx);
780 goto Done; 829 goto Done;
781# endif 830# endif
782 831
783 } 832 }
784 if (i >= 0 && i <= 7) 833 if (i >= 0 && i <= 7)
785 { /* normal colors */ 834 { /* normal colors */
786 PixColors[idx] = PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
787 SET_PIXCOLOR(idx); 836 SET_PIXCOLOR (idx);
788 goto Done; 837 goto Done;
789 } 838 }
790 } 839 }
791 if (!rXParseAllocColor (& xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
792 return; 841 return;
… …
801 if (PixColors[idx] == PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
802 break; 851 break;
803 if (i > Color_White) 852 if (i > Color_White)
804 { 853 {
805 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
806 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
807 DisplayPlanes(display->display, display->screen)); 856 DisplayPlanes (display->display, display->screen));
808 } 857 }
809# endif 858# endif
810 859
811 PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
812 SET_PIXCOLOR(idx); 861 SET_PIXCOLOR (idx);
813 862
814 /* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
815 /* Cursor cursor; */ 864 /* Cursor cursor; */
816Done: 865Done:
817 if (idx == Color_bg && !(Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
818 XSetWindowBackground(display->display, TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
819 PixColors[Color_bg]); 868 PixColors[Color_bg]);
820 869
821 /* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
822 871
823 set_colorfgbg (); 872 set_colorfgbg ();
… …
837 rxvt_color xcol[2]; 886 rxvt_color xcol[2];
838 887
839 xcol[0] = PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
840 xcol[1] = PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
841 XQueryColors (display->display, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
842 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
843#endif 892#endif
844} 893}
845 894
846/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
847/* 896/*
… …
850void 899void
851rxvt_term::set_colorfgbg () 900rxvt_term::set_colorfgbg ()
852{ 901{
853 unsigned int i; 902 unsigned int i;
854 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
855 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
856 905
857 env_colorfgbg = 906 env_colorfgbg =
858 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
859 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
860 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
861 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
862 if (PixColors[Color_fg] == PixColors[i]) 911 if (PixColors[Color_fg] == PixColors[i])
863 { 912 {
864 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
865 break; 914 break;
866 } 915 }
867 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
868 if (PixColors[Color_bg] == PixColors[i]) 917 if (PixColors[Color_bg] == PixColors[i])
869 { 918 {
870 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
871#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
872 xpmb = "default;"; 921 xpmb = "default;";
873#endif 922#endif
874 break; 923 break;
875 } 924 }
925
876 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
877 putenv(env_colorfgbg);
878 927
879#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
880 colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
881 for (i = minCOLOR; i <= maxCOLOR; i++) 930 for (i = minCOLOR; i <= maxCOLOR; i++)
882 { 931 {
883 if (PixColors[Color_fg] == PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
884 colorfgbg = SET_FGCOLOR(colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
885 if (PixColors[Color_bg] == PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
886 colorfgbg = SET_BGCOLOR(colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
887 } 936 }
888#endif 937#endif
889} 938}
890 939
891/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
… …
897int 946int
898rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
899{ 948{
900 if (!screen_in_out->set (display, colour)) 949 if (!screen_in_out->set (display, colour))
901 { 950 {
902 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
903 return false; 952 return false;
904 } 953 }
905 954
906 return true; 955 return true;
907} 956}
… …
987 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
988 1037
989 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
990 window_vt_y, TermWin_TotalWidth (), 1039 window_vt_y, TermWin_TotalWidth (),
991 TermWin_TotalHeight ()); 1040 TermWin_TotalHeight ());
992#ifdef RXVT_GRAPHICS
993 if (old_height)
994 Gr_Resize (old_width - szHint.base_width,
995 old_height - szHint.base_height);
996#endif
997 scr_clear (); 1041 scr_clear ();
998#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
999 resize_pixmap (); 1043 resize_pixmap ();
1000#endif 1044#endif
1001 1045
… …
1013 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1014 curr_screen = scr_change_screen (PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
1015 TermWin.ncol = ncol; 1059 TermWin.ncol = ncol;
1016 } 1060 }
1017 1061
1018 scr_reset(); 1062 scr_reset ();
1019 1063
1020 if (curr_screen >= 0) /* this is not the first time through */ 1064 if (curr_screen >= 0) /* this is not the first time through */
1021 { 1065 {
1022 scr_change_screen (curr_screen); 1066 scr_change_screen (curr_screen);
1023 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1041{ 1085{
1042 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
1043 1087
1044 if (width == 0 || height == 0) 1088 if (width == 0 || height == 0)
1045 { 1089 {
1046 XGetWindowAttributes(display->display, display->root, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
1047 if (width == 0) 1091 if (width == 0)
1048 width = wattr.width - szHint.base_width; 1092 width = wattr.width - szHint.base_width;
1049 if (height == 0) 1093 if (height == 0)
1050 height = wattr.height - szHint.base_height; 1094 height = wattr.height - szHint.base_height;
1051 } 1095 }
… …
1065void 1109void
1066rxvt_term::im_set_size (XRectangle *size) 1110rxvt_term::im_set_size (XRectangle *size)
1067{ 1111{
1068 size->x = TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
1069 size->y = TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
1070 size->width = Width2Pixel(TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
1071 size->height = Height2Pixel(TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
1072} 1116}
1073 1117
1074void 1118void
1075rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1076{ 1120{
… …
1086 Atom atom; 1130 Atom atom;
1087 Window win; 1131 Window win;
1088 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
1089 1133
1090 /* get current locale modifier */ 1134 /* get current locale modifier */
1091 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1092 { 1136 {
1093 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
1094 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1095 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1096 *p = '\0'; 1140 *p = '\0';
1097 1141
1098 atom = XInternAtom(display->display, server, False); 1142 atom = XInternAtom (display->display, server, False);
1099 win = XGetSelectionOwner(display->display, atom); 1143 win = XGetSelectionOwner (display->display, atom);
1100 if (win != None) 1144 if (win != None)
1101 return True; 1145 return True;
1102 } 1146 }
1103 return False; 1147 return False;
1104} 1148}
… …
1108{ 1152{
1109 XPoint spot; 1153 XPoint spot;
1110 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
1111 1155
1112 if (Input_Context == NULL 1156 if (Input_Context == NULL
1113 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1114 || !(event_type == KeyPress 1158 || ! (event_type == KeyPress
1115 || event_type == Expose 1159 || event_type == Expose
1116 || event_type == NoExpose 1160 || event_type == NoExpose
1117 || event_type == SelectionNotify 1161 || event_type == SelectionNotify
1118 || event_type == ButtonRelease || event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
1119 || !IMisRunning ()) 1163 || !IMisRunning ())
1120 return; 1164 return;
1121 1165
1122 im_set_position (&spot); 1166 im_set_position (&spot);
1123 1167
1124 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1125 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1126 XFree(preedit_attr); 1170 XFree (preedit_attr);
1127} 1171}
1128 1172
1129void 1173void
1130rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1131 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1132{ 1176{
1133 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1134 1178
1135 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1136 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1137 1181
1138 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1139 mbh -= TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1140 1184
1141 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1142 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1143 1187
1144 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1145 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1146 1190
1147 status_rect->x = vtx; 1191 status_rect->x = vtx;
1148 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1149 1193
1150 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1151 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1152} 1196}
1153 1197
1154void 1198void
1155rxvt_term::im_destroy () 1199rxvt_term::im_destroy ()
1156{ 1200{
… …
1182 const char *p; 1226 const char *p;
1183 char **s; 1227 char **s;
1184 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1185 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1186 1230
1187 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1188 return false; 1232 return false;
1189 1233
1190 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1191 input_method = display->get_xim (locale, modifiers); 1235 input_method = display->get_xim (locale, modifiers);
1192 if (input_method == NULL) 1236 if (input_method == NULL)
1193 return false; 1237 return false;
1194 1238
1195 xim = input_method->xim; 1239 xim = input_method->xim;
… …
1201 display->put_xim (input_method); 1245 display->put_xim (input_method);
1202 return false; 1246 return false;
1203 } 1247 }
1204 1248
1205 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1206 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1207 for (i = found = 0; !found && s[i]; i++) 1251 for (i = found = 0; !found && s[i]; i++)
1208 { 1252 {
1209 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1210 input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1211 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1212 input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1213 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1214 input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1215 1259
1216 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1217 if (input_style == xim_styles->supported_styles[j]) 1261 if (input_style == xim_styles->supported_styles[j])
1218 { 1262 {
… …
1239 { 1283 {
1240 im_set_size (&rect); 1284 im_set_size (&rect);
1241 im_set_position (&spot); 1285 im_set_position (&spot);
1242 im_set_color (&fg, &bg); 1286 im_set_color (&fg, &bg);
1243 1287
1244 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1245 XNSpotLocation, &spot, 1289 XNSpotLocation, &spot,
1246 XNForeground, fg, XNBackground, bg, 1290 XNForeground, fg, XNBackground, bg,
1247 //XNFontSet, TermWin.fontset, 1291 //XNFontSet, TermWin.fontset,
1248 NULL); 1292 NULL);
1249 } 1293 }
… …
1257 */ 1301 */
1258 needed_rect.width = 0; 1302 needed_rect.width = 0;
1259 1303
1260 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1261 1305
1262 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1263 XNForeground, fg, XNBackground, bg, 1307 XNForeground, fg, XNBackground, bg,
1264 //XNFontSet, TermWin.fontset, 1308 //XNFontSet, TermWin.fontset,
1265 NULL); 1309 NULL);
1266 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1267 XNForeground, fg, XNBackground, bg, 1311 XNForeground, fg, XNBackground, bg,
1268 //XNFontSet, TermWin.fontset, 1312 //XNFontSet, TermWin.fontset,
1269 NULL); 1313 NULL);
1270 } 1314 }
1271 1315
1272 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1273 XNClientWindow, TermWin.parent[0], 1317 XNClientWindow, TermWin.parent[0],
1274 XNFocusWindow, TermWin.parent[0], 1318 XNFocusWindow, TermWin.parent[0],
1275 preedit_attr ? XNPreeditAttributes : NULL, 1319 preedit_attr ? XNPreeditAttributes : NULL,
1276 preedit_attr, 1320 preedit_attr,
1277 status_attr ? XNStatusAttributes : NULL, 1321 status_attr ? XNStatusAttributes : NULL,
1278 status_attr, NULL); 1322 status_attr, NULL);
1279 if (preedit_attr) XFree(preedit_attr); 1323 if (preedit_attr) XFree (preedit_attr);
1280 if (status_attr) XFree(status_attr); 1324 if (status_attr) XFree (status_attr);
1281 1325
1282 if (Input_Context == NULL) 1326 if (Input_Context == NULL)
1283 { 1327 {
1284 rxvt_print_error("failed to create input context"); 1328 rxvt_print_error ("failed to create input context");
1285 display->put_xim (input_method); 1329 display->put_xim (input_method);
1286 return false; 1330 return false;
1287 } 1331 }
1288 1332
1289 if (input_style & XIMPreeditArea) 1333 if (input_style & XIMPreeditArea)
1290 IMSetStatusPosition (); 1334 IMSetStatusPosition ();
1291 1335
1292 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1293 return true; 1337 return true;
1294} 1338}
1295 1339
1296void 1340void
1297rxvt_term::im_cb () 1341rxvt_term::im_cb ()
… …
1301 char **s; 1345 char **s;
1302 char buf[IMBUFSIZ]; 1346 char buf[IMBUFSIZ];
1303 1347
1304 im_destroy (); 1348 im_destroy ();
1305 1349
1306 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1307 if (Input_Context) 1351 if (Input_Context)
1308 return; 1352 return;
1309 1353
1310#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1311 if (rs[Rs_imLocale]) 1355 if (rs[Rs_imLocale])
1312 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1356 SET_LOCALE (rs[Rs_imLocale]);
1313#endif 1357#endif
1314 1358
1315 p = rs[Rs_inputMethod]; 1359 p = rs[Rs_inputMethod];
1316 if (p && *p) 1360 if (p && *p)
1317 { 1361 {
… …
1330 break; 1374 break;
1331 } 1375 }
1332 } 1376 }
1333 } 1377 }
1334 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1335 free(s[i]); 1379 free (s[i]);
1336 free(s); 1380 free (s);
1337 1381
1338 if (found) 1382 if (found)
1339 goto done; 1383 goto done;
1340 } 1384 }
1341 1385
… …
1348 goto done; 1392 goto done;
1349 1393
1350done: 1394done:
1351#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1352 if (rs[Rs_imLocale]) 1396 if (rs[Rs_imLocale])
1353 setlocale (LC_CTYPE, locale); 1397 SET_LOCALE (locale);
1354#endif 1398#endif
1355} 1399}
1356 1400
1357void 1401void
1358rxvt_term::IMSetStatusPosition () 1402rxvt_term::IMSetStatusPosition ()
1359{ 1403{
1360 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1361 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1362 1406
1363 if (Input_Context == NULL 1407 if (Input_Context == NULL
1364 || !TermWin.focus || !(input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1365 || !IMisRunning ()) 1409 || !IMisRunning ())
1366 return; 1410 return;
1367 1411
1368 /* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1369 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1370 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1371 XFree(status_attr); 1415 XFree (status_attr);
1372 1416
1373 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1374 1418
1375 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1376 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1377 1421
1378 XSetICValues(Input_Context, 1422 XSetICValues (Input_Context,
1379 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1380 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1381 1425
1382 XFree(preedit_attr); 1426 XFree (preedit_attr);
1383 XFree(status_attr); 1427 XFree (status_attr);
1384} 1428}
1385#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1386 1430
1387/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1388rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

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