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

Diff Legend

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