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

Diff Legend

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