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.28 by pcg, Mon Feb 9 22:45:29 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)
… …
100 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
101} 105}
102 106
103rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
104{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
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
105 scr_release (); 138 scr_release ();
106 139
140 free (env_windowid);
141 free (env_display);
142 free (env_term);
143 free (env_colorfgbg);
107 free (locale); 144 free (locale);
108 free (codeset); 145 free (codeset);
109 146
110#ifndef NO_SETOWNER_TTYDEV 147 delete envv;
111 privileged_ttydev (RESTORE); 148 delete argv;
112#endif 149}
113#ifdef UTMP_SUPPORT
114 privileged_utmp (RESTORE);
115#endif
116#ifdef USE_XIM
117 if (Input_Context)
118 {
119 XDestroyIC (Input_Context);
120 Input_Context = NULL;
121 }
122#endif
123 150
124 if (TermWin.parent[0]) 151void
125 XDestroyWindow (display->display, TermWin.parent[0]); 152rxvt_term::destroy ()
126 153{
127 // TODO: free pixcolours, colours should become part of rxvt_display
128
129 delete PixColors;
130
131 if (cmd_fd >= 0)
132 close (cmd_fd);
133
134 if (display) 154 if (display)
135 displays.release (display);
136}
137
138void
139rxvt_term::destroy ()
140{
141 if (display)
142 { 155 {
156 rootwin_ev.stop (display);
143 termwin_ev.stop (display); 157 termwin_ev.stop (display);
144 vt_ev.stop (display); 158 vt_ev.stop (display);
159#ifdef USE_XIM
160 im_destroy ();
161 im_ev.stop (display);
162#endif
145#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
146 scrollbar_ev.stop (display); 164 scrollbar_ev.stop (display);
147#endif 165#endif
148#ifdef MENUBAR 166#ifdef MENUBAR
149 menubar_ev.stop (display); 167 menubar_ev.stop (display);
… …
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
336rxvt_xerror_handler (Display *display, XErrorEvent *event) 348rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
353 */ 365 */
354/* EXTPROTO */ 366/* EXTPROTO */
355void 367void
356rxvt_clean_exit () 368rxvt_clean_exit ()
357{ 369{
370 // TODO: rxvtd should clean up all ressources
371 if (GET_R)
358 GET_R->destroy (); 372 GET_R->destroy ();
359} 373}
360 374
361/* ------------------------------------------------------------------------- * 375/* ------------------------------------------------------------------------- *
362 * MEMORY ALLOCATION WRAPPERS * 376 * MEMORY ALLOCATION WRAPPERS *
363 * ------------------------------------------------------------------------- */ 377 * ------------------------------------------------------------------------- */
364/* EXTPROTO */ 378/* EXTPROTO */
365void * 379void *
366rxvt_malloc(size_t size) 380rxvt_malloc (size_t size)
367{ 381{
368 void *p; 382 void *p;
369 383
370 p = malloc(size); 384 p = malloc (size);
371 if (p) 385 if (p)
372 return p; 386 return p;
373 387
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 389 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 390 exit (EXIT_FAILURE);
377 /* NOTREACHED */ 391 /* NOTREACHED */
378} 392}
379 393
380/* EXTPROTO */ 394/* EXTPROTO */
381void * 395void *
382rxvt_calloc(size_t number, size_t size) 396rxvt_calloc (size_t number, size_t size)
383{ 397{
384 void *p; 398 void *p;
385 399
386 p = calloc(number, size); 400 p = calloc (number, size);
387 if (p) 401 if (p)
388 return p; 402 return p;
389 403
390 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
391 rxvt_clean_exit(); 405 rxvt_clean_exit ();
392 exit(EXIT_FAILURE); 406 exit (EXIT_FAILURE);
393 /* NOTREACHED */ 407 /* NOTREACHED */
394} 408}
395 409
396/* EXTPROTO */ 410/* EXTPROTO */
397void * 411void *
398rxvt_realloc(void *ptr, size_t size) 412rxvt_realloc (void *ptr, size_t size)
399{ 413{
400 void *p; 414 void *p;
401 415
402 if (ptr) 416 if (ptr)
403 p = realloc(ptr, size); 417 p = realloc (ptr, size);
404 else 418 else
405 p = malloc(size); 419 p = malloc (size);
406 if (p) 420 if (p)
407 return p; 421 return p;
408 422
409 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
410 rxvt_clean_exit(); 424 rxvt_clean_exit ();
411 exit(EXIT_FAILURE); 425 exit (EXIT_FAILURE);
412 /* NOTREACHED */ 426 /* NOTREACHED */
413} 427}
414 428
415/* ------------------------------------------------------------------------- * 429/* ------------------------------------------------------------------------- *
416 * PRIVILEGED OPERATIONS * 430 * PRIVILEGED OPERATIONS *
… …
419void 433void
420rxvt_term::privileges (int mode) 434rxvt_term::privileges (int mode)
421{ 435{
422#if ! defined(__CYGWIN32__) 436#if ! defined(__CYGWIN32__)
423# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 437# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
424 /* setreuid() is the poor man's setuid(), seteuid() */ 438 /* setreuid () is the poor man's setuid (), seteuid () */
425# define seteuid(a) setreuid(-1, (a)) 439# define seteuid(a) setreuid(-1, (a))
426# define setegid(a) setregid(-1, (a)) 440# define setegid(a) setregid(-1, (a))
427# define HAVE_SETEUID 441# define HAVE_SETEUID
428# endif 442# endif
429# ifdef HAVE_SETEUID 443# ifdef HAVE_SETEUID
… …
432 case IGNORE: 446 case IGNORE:
433 /* 447 /*
434 * 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
435 * back to root later, as required 449 * back to root later, as required
436 */ 450 */
437 seteuid(getuid()); 451 seteuid (getuid ());
438 setegid(getgid()); 452 setegid (getgid ());
439 break; 453 break;
440 case SAVE: 454 case SAVE:
441 euid = geteuid(); 455 euid = geteuid ();
442 egid = getegid(); 456 egid = getegid ();
443 break; 457 break;
444 case RESTORE: 458 case RESTORE:
445 seteuid(euid); 459 seteuid (euid);
446 setegid(egid); 460 setegid (egid);
447 break; 461 break;
448 } 462 }
449# else 463# else
450 switch (mode) 464 switch (mode)
451 { 465 {
452 case IGNORE: 466 case IGNORE:
453 setuid(getuid()); 467 setuid (getuid ());
454 setgid(getgid()); 468 setgid (getgid ());
455 /* FALLTHROUGH */ 469 /* FALLTHROUGH */
456 case SAVE: 470 case SAVE:
457 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
458 case RESTORE: 472 case RESTORE:
459 break; 473 break;
… …
464 478
465#ifdef UTMP_SUPPORT 479#ifdef UTMP_SUPPORT
466void 480void
467rxvt_term::privileged_utmp (char action) 481rxvt_term::privileged_utmp (char action)
468{ 482{
469 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)",
470 action, next_utmp_action, getpid())); 484 action, next_utmp_action, getpid ()));
471 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 485 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
472 || (Options & Opt_utmpInhibit) 486 || (Options & Opt_utmpInhibit)
473 || ttydev == NULL || *ttydev == '\0') 487 || ttydev == NULL || *ttydev == '\0')
474 return; 488 return;
475 489
… …
490 504
491#ifndef NO_SETOWNER_TTYDEV 505#ifndef NO_SETOWNER_TTYDEV
492void 506void
493rxvt_term::privileged_ttydev (char action) 507rxvt_term::privileged_ttydev (char action)
494{ 508{
495 D_MAIN((stderr, 509 D_MAIN ((stderr,
496 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 510 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
497 action, next_tty_action, getpid())); 511 action, next_tty_action, getpid ()));
498 if (next_tty_action != action || (action != SAVE && action != RESTORE) 512 if (next_tty_action != action || (action != SAVE && action != RESTORE)
499 || ttydev == NULL || *ttydev == '\0') 513 || ttydev == NULL || *ttydev == '\0')
500 return; 514 return;
501 515
502 privileges (RESTORE); 516 privileges (RESTORE);
503 517
504 if (action == SAVE) 518 if (action == SAVE)
505 { 519 {
506 next_tty_action = RESTORE; 520 next_tty_action = RESTORE;
507# ifndef RESET_TTY_TO_COMMON_DEFAULTS 521# ifndef RESET_TTY_TO_COMMON_DEFAULTS
508 /* 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 */
509 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 523 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
510 next_tty_action = IGNORE; 524 next_tty_action = IGNORE;
511 else 525 else
512# endif 526# endif
513 527
514 { 528 {
515 chown(ttydev, getuid(), ttygid); /* fail silently */ 529 chown (ttydev, getuid (), ttygid); /* fail silently */
516 chmod(ttydev, ttymode); 530 chmod (ttydev, ttymode);
517# ifdef HAVE_REVOKE 531# ifdef HAVE_REVOKE
518 revoke(ttydev); 532 revoke (ttydev);
519# endif 533# endif
520 534
521 } 535 }
522 } 536 }
523 else 537 else
524 { /* action == RESTORE */ 538 { /* action == RESTORE */
525 next_tty_action = IGNORE; 539 next_tty_action = IGNORE;
526# ifndef RESET_TTY_TO_COMMON_DEFAULTS 540# ifndef RESET_TTY_TO_COMMON_DEFAULTS
527 chmod(ttydev, ttyfd_stat.st_mode); 541 chmod (ttydev, ttyfd_stat.st_mode);
528 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 542 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
529# else 543# else
530 chmod(ttydev, 544 chmod (ttydev,
531 (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));
532 chown(ttydev, 0, 0); 546 chown (ttydev, 0, 0);
533# endif 547# endif
534 548
535 } 549 }
536 550
537 privileges (IGNORE); 551 privileges (IGNORE);
538 552
539# ifndef RESET_TTY_TO_COMMON_DEFAULTS 553# ifndef RESET_TTY_TO_COMMON_DEFAULTS
540 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 554 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
541 action == RESTORE ? "Restoring" : (action == 555 action == RESTORE ? "Restoring" : (action ==
542 SAVE ? "Saving" : 556 SAVE ? "Saving" :
543 "UNKNOWN ERROR for"), ttydev, 557 "UNKNOWN ERROR for"), ttydev,
544 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 558 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
545 ttyfd_stat.st_gid)); 559 ttyfd_stat.st_gid));
… …
558 short recalc_x, recalc_y; 572 short recalc_x, recalc_y;
559 int x, y, sb_w, mb_h, flags; 573 int x, y, sb_w, mb_h, flags;
560 unsigned int w, h; 574 unsigned int w, h;
561 unsigned int max_width, max_height; 575 unsigned int max_width, max_height;
562 576
563 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",
564 TermWin.ncol, TermWin.nrow, szHint.width, 578 TermWin.ncol, TermWin.nrow, szHint.width,
565 szHint.height)); 579 szHint.height));
566 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 580 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
567 szHint.win_gravity = NorthWestGravity; 581 szHint.win_gravity = NorthWestGravity;
568 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 582 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
571 flags = 0; 585 flags = 0;
572 if (!parsed_geometry) 586 if (!parsed_geometry)
573 { 587 {
574 parsed_geometry = 1; 588 parsed_geometry = 1;
575 if (rs[Rs_geometry]) 589 if (rs[Rs_geometry])
576 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 590 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
577 if (flags & WidthValue) 591 if (flags & WidthValue)
578 { 592 {
579 TermWin.ncol = BOUND_POSITIVE_INT16(w); 593 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
580 szHint.flags |= USSize; 594 szHint.flags |= USSize;
581 } 595 }
582 if (flags & HeightValue) 596 if (flags & HeightValue)
583 { 597 {
584 TermWin.nrow = BOUND_POSITIVE_INT16(h); 598 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
585 szHint.flags |= USSize; 599 szHint.flags |= USSize;
586 } 600 }
587 if (flags & XValue) 601 if (flags & XValue)
588 { 602 {
589 szHint.x = x; 603 szHint.x = x;
… …
618 632
619 sb_w = mb_h = 0; 633 sb_w = mb_h = 0;
620 window_vt_x = window_vt_y = 0; 634 window_vt_x = window_vt_y = 0;
621 if (scrollbar_visible ()) 635 if (scrollbar_visible ())
622 { 636 {
623 sb_w = scrollbar_TotalWidth(); 637 sb_w = scrollbar_TotalWidth ();
624 szHint.base_width += sb_w; 638 szHint.base_width += sb_w;
625 if (!(Options & Opt_scrollBar_right)) 639 if (! (Options & Opt_scrollBar_right))
626 window_vt_x = sb_w; 640 window_vt_x = sb_w;
627 } 641 }
628 if (menubar_visible ()) 642 if (menubar_visible ())
629 { 643 {
630 mb_h = menuBar_TotalHeight(); 644 mb_h = menuBar_TotalHeight ();
631 szHint.base_height += mb_h; 645 szHint.base_height += mb_h;
632 window_vt_y = mb_h; 646 window_vt_y = mb_h;
633 } 647 }
634 szHint.width_inc = TermWin.fwidth; 648 szHint.width_inc = TermWin.fwidth;
635 szHint.height_inc = TermWin.fheight; 649 szHint.height_inc = TermWin.fheight;
… …
641 szHint.width = width; 655 szHint.width = width;
642 TermWin.width = width - szHint.base_width; 656 TermWin.width = width - szHint.base_width;
643 } 657 }
644 else 658 else
645 { 659 {
646 MIN_IT(TermWin.width, max_width); 660 MIN_IT (TermWin.width, max_width);
647 szHint.width = szHint.base_width + TermWin.width; 661 szHint.width = szHint.base_width + TermWin.width;
648 } 662 }
649 if (height && height - szHint.base_height < max_height) 663 if (height && height - szHint.base_height < max_height)
650 { 664 {
651 szHint.height = height; 665 szHint.height = height;
652 TermWin.height = height - szHint.base_height; 666 TermWin.height = height - szHint.base_height;
653 } 667 }
654 else 668 else
655 { 669 {
656 MIN_IT(TermWin.height, max_height); 670 MIN_IT (TermWin.height, max_height);
657 szHint.height = szHint.base_height + TermWin.height; 671 szHint.height = szHint.base_height + TermWin.height;
658 } 672 }
659 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 673 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
660 window_sb_x = szHint.width - sb_w; 674 window_sb_x = szHint.width - sb_w;
661 675
… …
666 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 680 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
667 - szHint.height - 2 * TermWin.ext_bwidth); 681 - szHint.height - 2 * TermWin.ext_bwidth);
668 682
669 TermWin.ncol = TermWin.width / TermWin.fwidth; 683 TermWin.ncol = TermWin.width / TermWin.fwidth;
670 TermWin.nrow = TermWin.height / TermWin.fheight; 684 TermWin.nrow = TermWin.height / TermWin.fheight;
671 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",
672 TermWin.ncol, TermWin.nrow, szHint.width, 686 TermWin.ncol, TermWin.nrow, szHint.width,
673 szHint.height)); 687 szHint.height));
674 return; 688 return;
675} 689}
676 690
… …
692 ws.ws_xpixel = ws.ws_ypixel = 0; 706 ws.ws_xpixel = ws.ws_ypixel = 0;
693#ifndef DEBUG_SIZE 707#ifndef DEBUG_SIZE
694 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 708 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
695#else 709#else
696 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 710 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
697 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 711 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
698# ifdef SIGWINCH 712# ifdef SIGWINCH
699 else if (cmd_pid) /* force through to the command */ 713 else if (cmd_pid) /* force through to the command */
700 kill (cmd_pid, SIGWINCH); 714 kill (cmd_pid, SIGWINCH);
701# endif 715# endif
702#endif 716#endif
703} 717}
704 718
705/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
706/* rxvt_change_font() - Switch to a new font */ 720/* rxvt_change_font () - Switch to a new font */
707/* 721/*
708 * init = 1 - initialize 722 * init = 1 - initialize
709 * 723 *
710 * fontname == FONT_UP - switch to bigger font 724 * fontname == FONT_UP - switch to bigger font
711 * fontname == FONT_DN - switch to smaller font 725 * fontname == FONT_DN - switch to smaller font
712 */ 726 */
713void 727bool
714rxvt_term::change_font (int init, const char *fontname) 728rxvt_term::change_font (const char *fontname)
715{} 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);
716 741
717void 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
718rxvt_term::font_up_down (int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
719{} 768{
769 return false;
770}
720 771
721/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
722/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
723/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
724void 775void
725rxvt_term::set_title (const char *str) 776rxvt_term::set_title (const char *str)
726{ 777{
727#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
728 XStoreName(display->display, TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
729#else 780#else
730 char *name; 781 char *name;
731 782
732 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
733 name = NULL; 784 name = NULL;
734 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
735 XStoreName(display->display, TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
736 if (name) 787 if (name)
737 XFree(name); 788 XFree (name);
738#endif 789#endif
739} 790}
740 791
741void 792void
742rxvt_term::set_iconName (const char *str) 793rxvt_term::set_iconName (const char *str)
743{ 794{
744#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
745 XSetIconName(display->display, TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
746#else 797#else
747 char *name; 798 char *name;
748 799
749 if (XGetIconName(display->display, TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
750 name = NULL; 801 name = NULL;
751 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
752 XSetIconName(display->display, TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
753 if (name) 804 if (name)
754 XFree(name); 805 XFree (name);
755#endif 806#endif
756} 807}
757 808
758#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
759void 810void
… …
764 815
765 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
766 return; 817 return;
767 818
768 /* handle color aliases */ 819 /* handle color aliases */
769 if (isdigit(*color)) 820 if (isdigit (*color))
770 { 821 {
771 i = atoi(color); 822 i = atoi (color);
772 if (i >= 8 && i <= 15) 823 if (i >= 8 && i <= 15)
773 { /* bright colors */ 824 { /* bright colors */
774 i -= 8; 825 i -= 8;
775# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
776 PixColors[idx] = PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
777 SET_PIXCOLOR(idx); 828 SET_PIXCOLOR (idx);
778 goto Done; 829 goto Done;
779# endif 830# endif
780 831
781 } 832 }
782 if (i >= 0 && i <= 7) 833 if (i >= 0 && i <= 7)
783 { /* normal colors */ 834 { /* normal colors */
784 PixColors[idx] = PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
785 SET_PIXCOLOR(idx); 836 SET_PIXCOLOR (idx);
786 goto Done; 837 goto Done;
787 } 838 }
788 } 839 }
789 if (!rXParseAllocColor (& xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
790 return; 841 return;
… …
799 if (PixColors[idx] == PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
800 break; 851 break;
801 if (i > Color_White) 852 if (i > Color_White)
802 { 853 {
803 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
804 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
805 DisplayPlanes(display->display, display->screen)); 856 DisplayPlanes (display->display, display->screen));
806 } 857 }
807# endif 858# endif
808 859
809 PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
810 SET_PIXCOLOR(idx); 861 SET_PIXCOLOR (idx);
811 862
812 /* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
813 /* Cursor cursor; */ 864 /* Cursor cursor; */
814Done: 865Done:
815 if (idx == Color_bg && !(Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
816 XSetWindowBackground(display->display, TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
817 PixColors[Color_bg]); 868 PixColors[Color_bg]);
818 869
819 /* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
820 871
821 set_colorfgbg (); 872 set_colorfgbg ();
… …
835 rxvt_color xcol[2]; 886 rxvt_color xcol[2];
836 887
837 xcol[0] = PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
838 xcol[1] = PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
839 XQueryColors (display->display, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
840 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
841#endif 892#endif
842} 893}
843 894
844/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
845/* 896/*
… …
848void 899void
849rxvt_term::set_colorfgbg () 900rxvt_term::set_colorfgbg ()
850{ 901{
851 unsigned int i; 902 unsigned int i;
852 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
853 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
854 905
855 env_colorfgbg = 906 env_colorfgbg =
856 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
857 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
858 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
859 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
860 if (PixColors[Color_fg] == PixColors[i]) 911 if (PixColors[Color_fg] == PixColors[i])
861 { 912 {
862 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
863 break; 914 break;
864 } 915 }
865 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
866 if (PixColors[Color_bg] == PixColors[i]) 917 if (PixColors[Color_bg] == PixColors[i])
867 { 918 {
868 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
869#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
870 xpmb = "default;"; 921 xpmb = "default;";
871#endif 922#endif
872 break; 923 break;
873 } 924 }
925
874 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
875 putenv(env_colorfgbg);
876 927
877#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
878 colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
879 for (i = minCOLOR; i <= maxCOLOR; i++) 930 for (i = minCOLOR; i <= maxCOLOR; i++)
880 { 931 {
881 if (PixColors[Color_fg] == PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
882 colorfgbg = SET_FGCOLOR(colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
883 if (PixColors[Color_bg] == PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
884 colorfgbg = SET_BGCOLOR(colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
885 } 936 }
886#endif 937#endif
887} 938}
888 939
889/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
… …
895int 946int
896rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
897{ 948{
898 if (!screen_in_out->set (display, colour)) 949 if (!screen_in_out->set (display, colour))
899 { 950 {
900 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
901 return false; 952 return false;
902 } 953 }
903 954
904 return true; 955 return true;
905} 956}
… …
985 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
986 1037
987 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
988 window_vt_y, TermWin_TotalWidth (), 1039 window_vt_y, TermWin_TotalWidth (),
989 TermWin_TotalHeight ()); 1040 TermWin_TotalHeight ());
990#ifdef RXVT_GRAPHICS
991 if (old_height)
992 Gr_Resize (old_width - szHint.base_width,
993 old_height - szHint.base_height);
994#endif
995 scr_clear (); 1041 scr_clear ();
996#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
997 resize_pixmap (); 1043 resize_pixmap ();
998#endif 1044#endif
999 1045
… …
1011 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
1012 curr_screen = scr_change_screen (PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
1013 TermWin.ncol = ncol; 1059 TermWin.ncol = ncol;
1014 } 1060 }
1015 1061
1016 scr_reset(); 1062 scr_reset ();
1017 1063
1018 if (curr_screen >= 0) /* this is not the first time through */ 1064 if (curr_screen >= 0) /* this is not the first time through */
1019 { 1065 {
1020 scr_change_screen (curr_screen); 1066 scr_change_screen (curr_screen);
1021 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1039{ 1085{
1040 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
1041 1087
1042 if (width == 0 || height == 0) 1088 if (width == 0 || height == 0)
1043 { 1089 {
1044 XGetWindowAttributes(display->display, display->root, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
1045 if (width == 0) 1091 if (width == 0)
1046 width = wattr.width - szHint.base_width; 1092 width = wattr.width - szHint.base_width;
1047 if (height == 0) 1093 if (height == 0)
1048 height = wattr.height - szHint.base_height; 1094 height = wattr.height - szHint.base_height;
1049 } 1095 }
… …
1057 1103
1058/* -------------------------------------------------------------------- * 1104/* -------------------------------------------------------------------- *
1059 * - X INPUT METHOD ROUTINES - * 1105 * - X INPUT METHOD ROUTINES - *
1060 * -------------------------------------------------------------------- */ 1106 * -------------------------------------------------------------------- */
1061#ifdef USE_XIM 1107#ifdef USE_XIM
1108
1062void 1109void
1063rxvt_term::set_size (XRectangle *size) 1110rxvt_term::im_set_size (XRectangle *size)
1064{ 1111{
1065 size->x = TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
1066 size->y = TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
1067 size->width = Width2Pixel(TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
1068 size->height = Height2Pixel(TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
1069} 1116}
1070 1117
1071void 1118void
1072rxvt_term::set_color (unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1073{ 1120{
1074 *fg = PixColors[Color_fg]; 1121 *fg = PixColors[Color_fg];
1075 *bg = PixColors[Color_bg]; 1122 *bg = PixColors[Color_bg];
1076} 1123}
1077 1124
… …
1083 Atom atom; 1130 Atom atom;
1084 Window win; 1131 Window win;
1085 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
1086 1133
1087 /* get current locale modifier */ 1134 /* get current locale modifier */
1088 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1089 { 1136 {
1090 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
1091 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1092 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1093 *p = '\0'; 1140 *p = '\0';
1094 1141
1095 atom = XInternAtom(display->display, server, False); 1142 atom = XInternAtom (display->display, server, False);
1096 win = XGetSelectionOwner(display->display, atom); 1143 win = XGetSelectionOwner (display->display, atom);
1097 if (win != None) 1144 if (win != None)
1098 return True; 1145 return True;
1099 } 1146 }
1100 return False; 1147 return False;
1101} 1148}
… …
1105{ 1152{
1106 XPoint spot; 1153 XPoint spot;
1107 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
1108 1155
1109 if (Input_Context == NULL 1156 if (Input_Context == NULL
1110 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1111 || !(event_type == KeyPress 1158 || ! (event_type == KeyPress
1112 || event_type == Expose 1159 || event_type == Expose
1113 || event_type == NoExpose 1160 || event_type == NoExpose
1114 || event_type == SelectionNotify 1161 || event_type == SelectionNotify
1115 || event_type == ButtonRelease || event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
1116 || !IMisRunning ()) 1163 || !IMisRunning ())
1117 return; 1164 return;
1118 1165
1119 set_position (&spot); 1166 im_set_position (&spot);
1120 1167
1121 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1122 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1123 XFree(preedit_attr); 1170 XFree (preedit_attr);
1124} 1171}
1125 1172
1126void 1173void
1127rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1128 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1129{ 1176{
1130 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1131 1178
1132 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1133 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1134 1181
1135 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1136 mbh -= TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1137 1184
1138 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1139 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1140 1187
1141 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1142 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1143 1190
1144 status_rect->x = vtx; 1191 status_rect->x = vtx;
1145 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1146 1193
1147 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);
1148 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1149} 1196}
1150 1197
1151/* ARGSUSED */
1152/* EXTPROTO */
1153void 1198void
1154rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1199rxvt_term::im_destroy ()
1155 __attribute__ ((unused)), XPointer call_data
1156 __attribute__ ((unused)))
1157{ 1200{
1201 if (Input_Context)
1202 {
1203 XDestroyIC (Input_Context);
1158 GET_R->Input_Context = NULL; 1204 Input_Context = NULL;
1159 /* To avoid Segmentation Fault in C locale: Solaris only? */ 1205 }
1160 if (STRCMP (GET_R->locale, "C")) 1206
1161 XRegisterIMInstantiateCallback(GET_R->display->display, NULL, NULL, NULL, 1207 if (input_method)
1162 rxvt_IMInstantiateCallback, NULL); 1208 {
1209 display->put_xim (input_method);
1210 input_method = 0;
1211 }
1163} 1212}
1164 1213
1165/* 1214/*
1166 * Try to open a XIM with the current modifiers, then see if we can 1215 * Try to open a XIM with the current modifiers, then see if we can
1167 * open a suitable preedit type 1216 * open a suitable preedit type
1168 */ 1217 */
1169bool 1218bool
1170rxvt_term::IM_get_IC () 1219rxvt_term::IM_get_IC (const char *modifiers)
1171{ 1220{
1172 int i, j, found; 1221 int i, j, found;
1173 XIM xim; 1222 XIM xim;
1174 XPoint spot; 1223 XPoint spot;
1175 XRectangle rect, status_rect, needed_rect; 1224 XRectangle rect, status_rect, needed_rect;
1176 unsigned long fg, bg; 1225 unsigned long fg, bg;
1177 const char *p; 1226 const char *p;
1178 char **s; 1227 char **s;
1179 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1180 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1181 XIMCallback ximcallback;
1182 1230
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false;
1233
1183 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1184 xim = XOpenIM (display->display, NULL, NULL, NULL); 1235 input_method = display->get_xim (locale, modifiers);
1185 if (xim == NULL) 1236 if (input_method == NULL)
1186 return False; 1237 return false;
1238
1239 xim = input_method->xim;
1187 1240
1188 xim_styles = NULL; 1241 xim_styles = NULL;
1189 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1190 || !xim_styles || !xim_styles->count_styles) 1243 || !xim_styles || !xim_styles->count_styles)
1191 { 1244 {
1192 XCloseIM(xim); 1245 display->put_xim (input_method);
1193 return False; 1246 return false;
1194 } 1247 }
1195 1248
1196 p = rs[Rs_preeditType] ? rs[Rs_preeditType] 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1197 : "OverTheSpot,OffTheSpot,Root";
1198 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1199 for (i = found = 0; !found && s[i]; i++) 1251 for (i = found = 0; !found && s[i]; i++)
1200 { 1252 {
1201 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1202 input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1203 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1204 input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1205 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1206 input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1207 1259
1208 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1209 if (input_style == xim_styles->supported_styles[j]) 1261 if (input_style == xim_styles->supported_styles[j])
1210 { 1262 {
1211 found = 1; 1263 found = 1;
1212 break; 1264 break;
1213 } 1265 }
1214 } 1266 }
1267
1215 for (i = 0; s[i]; i++) 1268 for (i = 0; s[i]; i++)
1216 free(s[i]); 1269 free (s[i]);
1270
1217 free(s); 1271 free (s);
1218 XFree(xim_styles); 1272 XFree (xim_styles);
1219 1273
1220 if (!found) 1274 if (!found)
1221 { 1275 {
1222 XCloseIM(xim); 1276 display->put_xim (input_method);
1223 return False; 1277 return false;
1224 } 1278 }
1225
1226 ximcallback.callback = rxvt_IMDestroyCallback;
1227
1228 /* XXX: not sure why we need this (as well as IC one below) */
1229 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1230 1279
1231 preedit_attr = status_attr = NULL; 1280 preedit_attr = status_attr = NULL;
1232 1281
1233 if (input_style & XIMPreeditPosition) 1282 if (input_style & XIMPreeditPosition)
1234 { 1283 {
1235 set_size (&rect); 1284 im_set_size (&rect);
1236 set_position (&spot); 1285 im_set_position (&spot);
1237 set_color (&fg, &bg); 1286 im_set_color (&fg, &bg);
1238 1287
1239 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1240 XNSpotLocation, &spot, 1289 XNSpotLocation, &spot,
1241 XNForeground, fg, XNBackground, bg, 1290 XNForeground, fg, XNBackground, bg,
1242 //XNFontSet, TermWin.fontset, 1291 //XNFontSet, TermWin.fontset,
1243 NULL); 1292 NULL);
1244 } 1293 }
1245 else if (input_style & XIMPreeditArea) 1294 else if (input_style & XIMPreeditArea)
1246 { 1295 {
1247 set_color (&fg, &bg); 1296 im_set_color (&fg, &bg);
1248 1297
1249 /* 1298 /*
1250 * The necessary width of preedit area is unknown 1299 * The necessary width of preedit area is unknown
1251 * until create input context. 1300 * until create input context.
1252 */ 1301 */
1253 needed_rect.width = 0; 1302 needed_rect.width = 0;
1254 1303
1255 set_preedit_area(&rect, &status_rect, &needed_rect); 1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1256 1305
1257 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1258 XNForeground, fg, XNBackground, bg, 1307 XNForeground, fg, XNBackground, bg,
1259 //XNFontSet, TermWin.fontset, 1308 //XNFontSet, TermWin.fontset,
1260 NULL); 1309 NULL);
1261 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1262 XNForeground, fg, XNBackground, bg, 1311 XNForeground, fg, XNBackground, bg,
1263 //XNFontSet, TermWin.fontset, 1312 //XNFontSet, TermWin.fontset,
1264 NULL); 1313 NULL);
1265 } 1314 }
1315
1266 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1267 XNClientWindow, TermWin.parent[0], 1317 XNClientWindow, TermWin.parent[0],
1268 XNFocusWindow, TermWin.parent[0], 1318 XNFocusWindow, TermWin.parent[0],
1269 XNDestroyCallback, &ximcallback,
1270 preedit_attr ? XNPreeditAttributes : NULL, 1319 preedit_attr ? XNPreeditAttributes : NULL,
1271 preedit_attr, 1320 preedit_attr,
1272 status_attr ? XNStatusAttributes : NULL, 1321 status_attr ? XNStatusAttributes : NULL,
1273 status_attr, NULL); 1322 status_attr, NULL);
1274 if (preedit_attr) 1323 if (preedit_attr) XFree (preedit_attr);
1275 XFree(preedit_attr); 1324 if (status_attr) XFree (status_attr);
1276 if (status_attr) 1325
1277 XFree(status_attr);
1278 if (Input_Context == NULL) 1326 if (Input_Context == NULL)
1279 { 1327 {
1280 rxvt_print_error("failed to create input context"); 1328 rxvt_print_error ("failed to create input context");
1281 XCloseIM(xim); 1329 display->put_xim (input_method);
1282 return False; 1330 return false;
1283 } 1331 }
1332
1284 if (input_style & XIMPreeditArea) 1333 if (input_style & XIMPreeditArea)
1285 IMSetStatusPosition (); 1334 IMSetStatusPosition ();
1335
1286 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1287 return True; 1337 return true;
1288} 1338}
1289 1339
1290/*
1291 * X manual pages and include files don't match on some systems:
1292 * some think this is an XIDProc and others an XIMProc so we can't
1293 * use the first argument - need to update this to be nice for
1294 * both types via some sort of configure detection
1295 */
1296/* ARGSUSED */
1297/* EXTPROTO */
1298void 1340void
1299rxvt_IMInstantiateCallback(Display * unused 1341rxvt_term::im_cb ()
1300 __attribute__ ((unused)), XPointer client_data
1301 __attribute__ ((unused)), XPointer call_data
1302 __attribute__ ((unused)))
1303{ 1342{
1304 int i, found, had_im; 1343 int i, found, had_im;
1305 const char *p; 1344 const char *p;
1306 char **s; 1345 char **s;
1307 char buf[IMBUFSIZ]; 1346 char buf[IMBUFSIZ];
1308 1347
1348 im_destroy ();
1349
1309 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1310 if (GET_R->Input_Context) 1351 if (Input_Context)
1311 return; 1352 return;
1312 1353
1313#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1314 if (GET_R->rs[Rs_imLocale]) 1355 if (rs[Rs_imLocale])
1315 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]); 1356 SET_LOCALE (rs[Rs_imLocale]);
1316#endif 1357#endif
1317 1358
1318 p = GET_R->rs[Rs_inputMethod]; 1359 p = rs[Rs_inputMethod];
1319 if (p && *p) 1360 if (p && *p)
1320 { 1361 {
1321 bool found = false; 1362 bool found = false;
1322 1363
1323 s = rxvt_splitcommastring (p); 1364 s = rxvt_splitcommastring (p);
… …
1325 { 1366 {
1326 if (*s[i]) 1367 if (*s[i])
1327 { 1368 {
1328 STRCPY (buf, "@im="); 1369 STRCPY (buf, "@im=");
1329 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1370 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1330 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ()) 1371 if (IM_get_IC (buf))
1331 { 1372 {
1332 found = true; 1373 found = true;
1333 break; 1374 break;
1334 } 1375 }
1335 } 1376 }
1336 } 1377 }
1337 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1338 free(s[i]); 1379 free (s[i]);
1339 free(s); 1380 free (s);
1340 1381
1341 if (found) 1382 if (found)
1342 goto done; 1383 goto done;
1343 } 1384 }
1344 1385
1345 /* try with XMODIFIERS env. var. */ 1386 /* try with XMODIFIERS env. var. */
1346 if ((p = XSetLocaleModifiers ("")) && *p 1387 if (IM_get_IC (""))
1347 && GET_R->IM_get_IC ())
1348 goto done; 1388 goto done;
1349 1389
1350 /* try with no modifiers base IF the user didn't specify an IM */ 1390 /* try with no modifiers base IF the user didn't specify an IM */
1351 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1391 if (IM_get_IC ("@im=none"))
1352 && GET_R->IM_get_IC () == True)
1353 goto done; 1392 goto done;
1354 1393
1355done: 1394done:
1356#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1357 if (GET_R->rs[Rs_imLocale]) 1396 if (rs[Rs_imLocale])
1358 setlocale (LC_CTYPE, GET_R->locale); 1397 SET_LOCALE (locale);
1359#endif 1398#endif
1360} 1399}
1361 1400
1362void 1401void
1363rxvt_term::IMSetStatusPosition () 1402rxvt_term::IMSetStatusPosition ()
1364{ 1403{
1365 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1366 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1367 1406
1368 if (Input_Context == NULL 1407 if (Input_Context == NULL
1369 || !TermWin.focus || !(input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1370 || !IMisRunning ()) 1409 || !IMisRunning ())
1371 return; 1410 return;
1372 1411
1373 /* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1374 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1375 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1376 XFree(status_attr); 1415 XFree (status_attr);
1377 1416
1378 set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1379 1418
1380 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1381 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1382 1421
1383 XSetICValues(Input_Context, 1422 XSetICValues (Input_Context,
1384 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1385 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1386 1425
1387 XFree(preedit_attr); 1426 XFree (preedit_attr);
1388 XFree(status_attr); 1427 XFree (status_attr);
1389} 1428}
1390#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1391 1430
1392/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1393rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

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