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.51 by pcg, Sat Mar 6 00:05:01 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.
… …
55 STRNCPY (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
57 } 58 }
58} 59}
59 60
61class rxvt_composite_vec rxvt_composite;
62
63text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2)
64{
65 compose_char *cc;
66
67 // break compose chains, as stupid readline really likes to duplicate
68 // composing characters for some reason near the end of a line.
69 cc = (*this)[c1];
70 while (cc)
71 {
72 if (cc->c2 == c2) return c1;
73 cc = (*this)[cc->c1];
74 }
75
76 // check to see wether this combination already exists otherwise
77 for (cc = v.end (); cc-- > v.begin (); )
78 {
79 if (cc->c1 == c1 && cc->c2 == c2)
80 return COMPOSE_LO + (cc - v.begin ());
81 }
82
83 // allocate a new combination
84 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
85 {
86 static int seen;
87
88 if (!seen++)
89 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
90
91 return REPLACEMENT_CHAR;
92 }
93
94 v.push_back (compose_char (c1, c2));
95
96 return v.size () - 1 + COMPOSE_LO;
97}
98
99int rxvt_composite_vec::expand (uint32_t c, wchar_t *r)
100{
101 compose_char *cc = (*this)[c];
102
103 if (!cc)
104 {
105 if (r) *r = c;
106 return 1;
107 }
108
109 int len = expand (cc->c1, r);
110
111 if (r) r += len;
112
113 if (cc->c2 != NOCHAR)
114 {
115 len++;
116 if (r) *r++ = cc->c2;
117 }
118
119 return len;
120
121}
122
123extern struct rxvt_composite_vec rxvt_composite;
60void * 124void *
61rxvt_term::operator new (size_t s) 125rxvt_term::operator new (size_t s)
62{ 126{
63 void *p = malloc (s); 127 void *p = malloc (s);
64 128
… …
79 vt_ev (this, &rxvt_term::x_cb), 143 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 144#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 145 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 146#endif
83#ifdef MENUBAR 147#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 148 menubar_ev (this, &rxvt_term::x_cb),
85#endif 149#endif
86#ifdef CURSOR_BLINK 150#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 151 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 152#endif
89#ifdef TEXT_BLINK 153#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 154 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 155#endif
92#ifdef POINTER_BLANK 156#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 157 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif
159#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb),
94#endif 161#endif
95 check_ev (this, &rxvt_term::check_cb), 162 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 163 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 164 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb) 165 incr_ev (this, &rxvt_term::incr_cb)
… …
100 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 167 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
101} 168}
102 169
103rxvt_term::~rxvt_term () 170rxvt_term::~rxvt_term ()
104{ 171{
172 if (cmd_fd >= 0)
173 close (cmd_fd);
174
175#ifndef NO_SETOWNER_TTYDEV
176 privileged_ttydev (RESTORE);
177#endif
178#ifdef UTMP_SUPPORT
179 privileged_utmp (RESTORE);
180#endif
181
182 delete TermWin.fontset;
183
184 if (display)
185 {
186#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable;
188 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win);
190#endif
191 delete TermWin.drawable;
192 // destroy all windows
193 if (TermWin.parent[0])
194 XDestroyWindow (display->display, TermWin.parent[0]);
195 }
196
197 // TODO: free pixcolours, colours should become part of rxvt_display
198
199 delete PixColors;
200
201 displays.put (display);
202
105 scr_release (); 203 scr_release ();
106 204
205 free (env_windowid);
206 free (env_display);
207 free (env_term);
208 free (env_colorfgbg);
107 free (locale); 209 free (locale);
108 free (codeset); 210 free (codeset);
109 211
110#ifndef NO_SETOWNER_TTYDEV 212 delete envv;
111 privileged_ttydev (RESTORE); 213 delete argv;
112#endif 214}
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 215
124 if (TermWin.parent[0]) 216void
125 XDestroyWindow (display->display, TermWin.parent[0]); 217rxvt_term::destroy ()
126 218{
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) 219 if (display)
135 displays.release (display);
136}
137
138void
139rxvt_term::destroy ()
140{
141 if (display)
142 { 220 {
221 rootwin_ev.stop (display);
143 termwin_ev.stop (display); 222 termwin_ev.stop (display);
144 vt_ev.stop (display); 223 vt_ev.stop (display);
224#ifdef USE_XIM
225 im_destroy ();
226 im_ev.stop (display);
227#endif
145#ifdef HAVE_SCROLLBARS 228#ifdef HAVE_SCROLLBARS
146 scrollbar_ev.stop (display); 229 scrollbar_ev.stop (display);
147#endif 230#endif
148#ifdef MENUBAR 231#ifdef MENUBAR
149 menubar_ev.stop (display); 232 menubar_ev.stop (display);
… …
172 255
173 delete this; 256 delete this;
174} 257}
175 258
176/*----------------------------------------------------------------------*/ 259/*----------------------------------------------------------------------*/
177/* rxvt_init() */ 260/* rxvt_init () */
178/* LIBPROTO */ 261/* LIBPROTO */
179rxvt_t 262rxvt_t
180rxvt_init (int argc, const char *const *argv) 263rxvt_init (int argc, const char *const *argv)
181{ 264{
182 SET_R (new rxvt_term); 265 SET_R (new rxvt_term);
… …
188 } 271 }
189 272
190 return GET_R; 273 return GET_R;
191} 274}
192 275
193static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event); 276static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
194 277
195void 278void
196rxvt_init_signals () 279rxvt_init_signals ()
197{ 280{
198 /* install exit handler for cleanup */ 281 /* install exit handler for cleanup */
199#if 0 282#if 0
200#ifdef HAVE_ATEXIT 283#ifdef HAVE_ATEXIT
201 atexit(rxvt_clean_exit); 284 atexit (rxvt_clean_exit);
202#else 285#else
203#endif 286#endif
204#endif 287#endif
205 288
206 struct sigaction sa; 289 struct sigaction sa;
… …
238 321
239 const char **cmd_argv = init_resources (argc, argv); 322 const char **cmd_argv = init_resources (argc, argv);
240 323
241 set_locale (""); 324 set_locale ("");
242 325
243#if (MENUBAR_MAX) 326#if MENUBAR_MAX
244 menubar_read (rs[Rs_menu]); 327 menubar_read (rs[Rs_menu]);
245#endif 328#endif
246#ifdef HAVE_SCROLLBARS 329#ifdef HAVE_SCROLLBARS
247 if (Options & Opt_scrollBar) 330 if (Options & Opt_scrollBar)
248 scrollBar.setIdle (); /* set existence for size calculations */ 331 scrollBar.setIdle (); /* set existence for size calculations */
… …
251 create_windows (argc, argv); 334 create_windows (argc, argv);
252 335
253 init_xlocale (); 336 init_xlocale ();
254 337
255 scr_reset (); /* initialize screen */ 338 scr_reset (); /* initialize screen */
256#ifdef RXVT_GRAPHICS
257 Gr_reset (); /* reset graphics */
258#endif
259 339
260#if 0 340#if 0
261#ifdef DEBUG_X
262 XSynchronize(display->display, True); 341 XSynchronize (display->display, True);
263#endif
264#endif 342#endif
265 343
266#ifdef HAVE_SCROLLBARS 344#ifdef HAVE_SCROLLBARS
267 if (Options & Opt_scrollBar) 345 if (Options & Opt_scrollBar)
268 resize_scrollbar (); /* create and map scrollbar */ 346 resize_scrollbar (); /* create and map scrollbar */
269#endif 347#endif
270#if (MENUBAR_MAX) 348#if (MENUBAR_MAX)
271 if (menubar_visible(r)) 349 if (menubar_visible ())
272 XMapWindow (display->display, menuBar.win); 350 XMapWindow (display->display, menuBar.win);
273#endif 351#endif
274#ifdef TRANSPARENT 352#ifdef TRANSPARENT
275 if (Options & Opt_transparent) 353 if (Options & Opt_transparent)
276 { 354 {
… …
282 rootwin_ev.start (display, display->root); 360 rootwin_ev.start (display, display->root);
283 361
284 XMapWindow (display->display, TermWin.vt); 362 XMapWindow (display->display, TermWin.vt);
285 XMapWindow (display->display, TermWin.parent[0]); 363 XMapWindow (display->display, TermWin.parent[0]);
286 364
287 init_env ();
288 init_command (cmd_argv); 365 init_command (cmd_argv);
289 366
290 pty_ev.start (cmd_fd, EVENT_READ); 367 pty_ev.start (cmd_fd, EVENT_READ);
291 368
292 check_ev.start (); 369 check_ev.start ();
… …
301 * Catch a SIGCHLD signal and exit if the direct child has died 378 * Catch a SIGCHLD signal and exit if the direct child has died
302 */ 379 */
303/* ARGSUSED */ 380/* ARGSUSED */
304/* EXTPROTO */ 381/* EXTPROTO */
305RETSIGTYPE 382RETSIGTYPE
306rxvt_Child_signal(int sig __attribute__ ((unused))) 383rxvt_Child_signal (int sig __attribute__ ((unused)))
307{ 384{
308 int pid, save_errno = errno; 385 int pid, save_errno = errno;
309 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 386 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
310 ; 387 ;
311 errno = save_errno; 388 errno = save_errno;
… …
319/* 396/*
320 * Catch a fatal signal and tidy up before quitting 397 * Catch a fatal signal and tidy up before quitting
321 */ 398 */
322/* EXTPROTO */ 399/* EXTPROTO */
323RETSIGTYPE 400RETSIGTYPE
324rxvt_Exit_signal(int sig) 401rxvt_Exit_signal (int sig)
325{ 402{
326 signal(sig, SIG_DFL); 403 signal (sig, SIG_DFL);
327#ifdef DEBUG_CMD 404#ifdef DEBUG_CMD
328 rxvt_print_error("signal %d", sig); 405 rxvt_print_error ("signal %d", sig);
329#endif 406#endif
330 rxvt_clean_exit(); 407 rxvt_clean_exit ();
331 kill(getpid(), sig); 408 kill (getpid (), sig);
332} 409}
333 410
334/* INTPROTO */ 411/* INTPROTO */
335int 412int
336rxvt_xerror_handler (Display *display, XErrorEvent *event) 413rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
353 */ 430 */
354/* EXTPROTO */ 431/* EXTPROTO */
355void 432void
356rxvt_clean_exit () 433rxvt_clean_exit ()
357{ 434{
435 // TODO: rxvtd should clean up all ressources
436 if (GET_R)
358 GET_R->destroy (); 437 GET_R->destroy ();
359} 438}
360 439
361/* ------------------------------------------------------------------------- * 440/* ------------------------------------------------------------------------- *
362 * MEMORY ALLOCATION WRAPPERS * 441 * MEMORY ALLOCATION WRAPPERS *
363 * ------------------------------------------------------------------------- */ 442 * ------------------------------------------------------------------------- */
364/* EXTPROTO */ 443/* EXTPROTO */
365void * 444void *
366rxvt_malloc(size_t size) 445rxvt_malloc (size_t size)
367{ 446{
368 void *p; 447 void *p;
369 448
370 p = malloc(size); 449 p = malloc (size);
371 if (p) 450 if (p)
372 return p; 451 return p;
373 452
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 453 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 454 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 455 exit (EXIT_FAILURE);
377 /* NOTREACHED */ 456 /* NOTREACHED */
378} 457}
379 458
380/* EXTPROTO */ 459/* EXTPROTO */
381void * 460void *
382rxvt_calloc(size_t number, size_t size) 461rxvt_calloc (size_t number, size_t size)
383{ 462{
384 void *p; 463 void *p;
385 464
386 p = calloc(number, size); 465 p = calloc (number, size);
387 if (p) 466 if (p)
388 return p; 467 return p;
389 468
390 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 469 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
391 rxvt_clean_exit(); 470 rxvt_clean_exit ();
392 exit(EXIT_FAILURE); 471 exit (EXIT_FAILURE);
393 /* NOTREACHED */ 472 /* NOTREACHED */
394} 473}
395 474
396/* EXTPROTO */ 475/* EXTPROTO */
397void * 476void *
398rxvt_realloc(void *ptr, size_t size) 477rxvt_realloc (void *ptr, size_t size)
399{ 478{
400 void *p; 479 void *p;
401 480
402 if (ptr) 481 if (ptr)
403 p = realloc(ptr, size); 482 p = realloc (ptr, size);
404 else 483 else
405 p = malloc(size); 484 p = malloc (size);
406 if (p) 485 if (p)
407 return p; 486 return p;
408 487
409 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 488 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
410 rxvt_clean_exit(); 489 rxvt_clean_exit ();
411 exit(EXIT_FAILURE); 490 exit (EXIT_FAILURE);
412 /* NOTREACHED */ 491 /* NOTREACHED */
413} 492}
414 493
415/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
416 * PRIVILEGED OPERATIONS * 495 * PRIVILEGED OPERATIONS *
… …
419void 498void
420rxvt_term::privileges (int mode) 499rxvt_term::privileges (int mode)
421{ 500{
422#if ! defined(__CYGWIN32__) 501#if ! defined(__CYGWIN32__)
423# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 502# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
424 /* setreuid() is the poor man's setuid(), seteuid() */ 503 /* setreuid () is the poor man's setuid (), seteuid () */
425# define seteuid(a) setreuid(-1, (a)) 504# define seteuid(a) setreuid(-1, (a))
426# define setegid(a) setregid(-1, (a)) 505# define setegid(a) setregid(-1, (a))
427# define HAVE_SETEUID 506# define HAVE_SETEUID
428# endif 507# endif
429# ifdef HAVE_SETEUID 508# ifdef HAVE_SETEUID
… …
432 case IGNORE: 511 case IGNORE:
433 /* 512 /*
434 * change effective uid/gid - not real uid/gid - so we can switch 513 * change effective uid/gid - not real uid/gid - so we can switch
435 * back to root later, as required 514 * back to root later, as required
436 */ 515 */
437 seteuid(getuid()); 516 seteuid (getuid ());
438 setegid(getgid()); 517 setegid (getgid ());
439 break; 518 break;
440 case SAVE: 519 case SAVE:
441 euid = geteuid(); 520 euid = geteuid ();
442 egid = getegid(); 521 egid = getegid ();
443 break; 522 break;
444 case RESTORE: 523 case RESTORE:
445 seteuid(euid); 524 seteuid (euid);
446 setegid(egid); 525 setegid (egid);
447 break; 526 break;
448 } 527 }
449# else 528# else
450 switch (mode) 529 switch (mode)
451 { 530 {
452 case IGNORE: 531 case IGNORE:
453 setuid(getuid()); 532 setuid (getuid ());
454 setgid(getgid()); 533 setgid (getgid ());
455 /* FALLTHROUGH */ 534 /* FALLTHROUGH */
456 case SAVE: 535 case SAVE:
457 /* FALLTHROUGH */ 536 /* FALLTHROUGH */
458 case RESTORE: 537 case RESTORE:
459 break; 538 break;
… …
464 543
465#ifdef UTMP_SUPPORT 544#ifdef UTMP_SUPPORT
466void 545void
467rxvt_term::privileged_utmp (char action) 546rxvt_term::privileged_utmp (char action)
468{ 547{
469 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 548 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
470 action, next_utmp_action, getpid())); 549 action, next_utmp_action, getpid ()));
471 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 550 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
472 || (Options & Opt_utmpInhibit) 551 || (Options & Opt_utmpInhibit)
473 || ttydev == NULL || *ttydev == '\0') 552 || ttydev == NULL || *ttydev == '\0')
474 return; 553 return;
475 554
… …
490 569
491#ifndef NO_SETOWNER_TTYDEV 570#ifndef NO_SETOWNER_TTYDEV
492void 571void
493rxvt_term::privileged_ttydev (char action) 572rxvt_term::privileged_ttydev (char action)
494{ 573{
495 D_MAIN((stderr, 574 D_MAIN ((stderr,
496 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 575 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
497 action, next_tty_action, getpid())); 576 action, next_tty_action, getpid ()));
498 if (next_tty_action != action || (action != SAVE && action != RESTORE) 577 if (next_tty_action != action || (action != SAVE && action != RESTORE)
499 || ttydev == NULL || *ttydev == '\0') 578 || ttydev == NULL || *ttydev == '\0')
500 return; 579 return;
501 580
502 privileges (RESTORE); 581 privileges (RESTORE);
503 582
504 if (action == SAVE) 583 if (action == SAVE)
505 { 584 {
506 next_tty_action = RESTORE; 585 next_tty_action = RESTORE;
507# ifndef RESET_TTY_TO_COMMON_DEFAULTS 586# ifndef RESET_TTY_TO_COMMON_DEFAULTS
508 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 587 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
509 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 588 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
510 next_tty_action = IGNORE; 589 next_tty_action = IGNORE;
511 else 590 else
512# endif 591# endif
513 592
514 { 593 {
515 chown(ttydev, getuid(), ttygid); /* fail silently */ 594 chown (ttydev, getuid (), ttygid); /* fail silently */
516 chmod(ttydev, ttymode); 595 chmod (ttydev, ttymode);
517# ifdef HAVE_REVOKE 596# ifdef HAVE_REVOKE
518 revoke(ttydev); 597 revoke (ttydev);
519# endif 598# endif
520 599
521 } 600 }
522 } 601 }
523 else 602 else
524 { /* action == RESTORE */ 603 { /* action == RESTORE */
525 next_tty_action = IGNORE; 604 next_tty_action = IGNORE;
526# ifndef RESET_TTY_TO_COMMON_DEFAULTS 605# ifndef RESET_TTY_TO_COMMON_DEFAULTS
527 chmod(ttydev, ttyfd_stat.st_mode); 606 chmod (ttydev, ttyfd_stat.st_mode);
528 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 607 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
529# else 608# else
530 chmod(ttydev, 609 chmod (ttydev,
531 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 610 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
532 chown(ttydev, 0, 0); 611 chown (ttydev, 0, 0);
533# endif 612# endif
534 613
535 } 614 }
536 615
537 privileges (IGNORE); 616 privileges (IGNORE);
538 617
539# ifndef RESET_TTY_TO_COMMON_DEFAULTS 618# ifndef RESET_TTY_TO_COMMON_DEFAULTS
540 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 619 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
541 action == RESTORE ? "Restoring" : (action == 620 action == RESTORE ? "Restoring" : (action ==
542 SAVE ? "Saving" : 621 SAVE ? "Saving" :
543 "UNKNOWN ERROR for"), ttydev, 622 "UNKNOWN ERROR for"), ttydev,
544 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 623 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
545 ttyfd_stat.st_gid)); 624 ttyfd_stat.st_gid));
… …
558 short recalc_x, recalc_y; 637 short recalc_x, recalc_y;
559 int x, y, sb_w, mb_h, flags; 638 int x, y, sb_w, mb_h, flags;
560 unsigned int w, h; 639 unsigned int w, h;
561 unsigned int max_width, max_height; 640 unsigned int max_width, max_height;
562 641
563 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 642 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
564 TermWin.ncol, TermWin.nrow, szHint.width, 643 TermWin.ncol, TermWin.nrow, szHint.width,
565 szHint.height)); 644 szHint.height));
566 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 645 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
567 szHint.win_gravity = NorthWestGravity; 646 szHint.win_gravity = NorthWestGravity;
568 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 647 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
571 flags = 0; 650 flags = 0;
572 if (!parsed_geometry) 651 if (!parsed_geometry)
573 { 652 {
574 parsed_geometry = 1; 653 parsed_geometry = 1;
575 if (rs[Rs_geometry]) 654 if (rs[Rs_geometry])
576 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 655 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
577 if (flags & WidthValue) 656 if (flags & WidthValue)
578 { 657 {
579 TermWin.ncol = BOUND_POSITIVE_INT16(w); 658 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
580 szHint.flags |= USSize; 659 szHint.flags |= USSize;
581 } 660 }
582 if (flags & HeightValue) 661 if (flags & HeightValue)
583 { 662 {
584 TermWin.nrow = BOUND_POSITIVE_INT16(h); 663 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
585 szHint.flags |= USSize; 664 szHint.flags |= USSize;
586 } 665 }
587 if (flags & XValue) 666 if (flags & XValue)
588 { 667 {
589 szHint.x = x; 668 szHint.x = x;
… …
618 697
619 sb_w = mb_h = 0; 698 sb_w = mb_h = 0;
620 window_vt_x = window_vt_y = 0; 699 window_vt_x = window_vt_y = 0;
621 if (scrollbar_visible ()) 700 if (scrollbar_visible ())
622 { 701 {
623 sb_w = scrollbar_TotalWidth(); 702 sb_w = scrollbar_TotalWidth ();
624 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
625 if (!(Options & Opt_scrollBar_right)) 704 if (! (Options & Opt_scrollBar_right))
626 window_vt_x = sb_w; 705 window_vt_x = sb_w;
627 } 706 }
628 if (menubar_visible ()) 707 if (menubar_visible ())
629 { 708 {
630 mb_h = menuBar_TotalHeight(); 709 mb_h = menuBar_TotalHeight ();
631 szHint.base_height += mb_h; 710 szHint.base_height += mb_h;
632 window_vt_y = mb_h; 711 window_vt_y = mb_h;
633 } 712 }
634 szHint.width_inc = TermWin.fwidth; 713 szHint.width_inc = TermWin.fwidth;
635 szHint.height_inc = TermWin.fheight; 714 szHint.height_inc = TermWin.fheight;
… …
641 szHint.width = width; 720 szHint.width = width;
642 TermWin.width = width - szHint.base_width; 721 TermWin.width = width - szHint.base_width;
643 } 722 }
644 else 723 else
645 { 724 {
646 MIN_IT(TermWin.width, max_width); 725 MIN_IT (TermWin.width, max_width);
647 szHint.width = szHint.base_width + TermWin.width; 726 szHint.width = szHint.base_width + TermWin.width;
648 } 727 }
649 if (height && height - szHint.base_height < max_height) 728 if (height && height - szHint.base_height < max_height)
650 { 729 {
651 szHint.height = height; 730 szHint.height = height;
652 TermWin.height = height - szHint.base_height; 731 TermWin.height = height - szHint.base_height;
653 } 732 }
654 else 733 else
655 { 734 {
656 MIN_IT(TermWin.height, max_height); 735 MIN_IT (TermWin.height, max_height);
657 szHint.height = szHint.base_height + TermWin.height; 736 szHint.height = szHint.base_height + TermWin.height;
658 } 737 }
659 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 738 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
660 window_sb_x = szHint.width - sb_w; 739 window_sb_x = szHint.width - sb_w;
661 740
… …
666 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 745 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
667 - szHint.height - 2 * TermWin.ext_bwidth); 746 - szHint.height - 2 * TermWin.ext_bwidth);
668 747
669 TermWin.ncol = TermWin.width / TermWin.fwidth; 748 TermWin.ncol = TermWin.width / TermWin.fwidth;
670 TermWin.nrow = TermWin.height / TermWin.fheight; 749 TermWin.nrow = TermWin.height / TermWin.fheight;
671 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 750 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
672 TermWin.ncol, TermWin.nrow, szHint.width, 751 TermWin.ncol, TermWin.nrow, szHint.width,
673 szHint.height)); 752 szHint.height));
674 return; 753 return;
675} 754}
676 755
… …
692 ws.ws_xpixel = ws.ws_ypixel = 0; 771 ws.ws_xpixel = ws.ws_ypixel = 0;
693#ifndef DEBUG_SIZE 772#ifndef DEBUG_SIZE
694 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 773 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
695#else 774#else
696 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 775 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
697 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 776 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
698# ifdef SIGWINCH 777# ifdef SIGWINCH
699 else if (cmd_pid) /* force through to the command */ 778 else if (cmd_pid) /* force through to the command */
700 kill (cmd_pid, SIGWINCH); 779 kill (cmd_pid, SIGWINCH);
701# endif 780# endif
702#endif 781#endif
703} 782}
704 783
705/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
706/* rxvt_change_font() - Switch to a new font */ 785/* rxvt_change_font () - Switch to a new font */
707/* 786/*
708 * init = 1 - initialize 787 * init = 1 - initialize
709 * 788 *
710 * fontname == FONT_UP - switch to bigger font 789 * fontname == FONT_UP - switch to bigger font
711 * fontname == FONT_DN - switch to smaller font 790 * fontname == FONT_DN - switch to smaller font
712 */ 791 */
713void 792bool
714rxvt_term::change_font (int init, const char *fontname) 793rxvt_term::change_font (const char *fontname)
715{} 794{
795 if (fontname == FONT_UP)
796 {
797 // TODO
798 }
799 else if (fontname == FONT_DN)
800 {
801 // TODO
802 }
803 else
804 {
805 rxvt_fontset *fs = new rxvt_fontset (this);
716 806
717void 807 if (fs && fs->populate (fontname ? fontname : "fixed"))
808 {
809 delete TermWin.fontset;
810 TermWin.fontset = fs;
811 TermWin.fwidth = fs->base_font ()->width;
812 TermWin.fheight = fs->base_font ()->height;
813 TermWin.fbase = fs->base_font ()->ascent;
814
815 if (TermWin.parent[0])
816 {
817 resize_all_windows (0, 0, 0);
818 scr_remap_chars ();
819 scr_touch (true);
820 }
821
822 return true;
823 }
824 }
825
826 return false;
827}
828
829bool
718rxvt_term::font_up_down (int n, int direction) 830rxvt_term::font_up_down (int n, int direction)
719{} 831{
832 return false;
833}
720 834
721/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
722/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
723/* xterm sequences - title, iconName, color (exptl) */ 837/* xterm sequences - title, iconName, color (exptl) */
724void 838void
725rxvt_term::set_title (const char *str) 839rxvt_term::set_title (const char *str)
726{ 840{
727#ifndef SMART_WINDOW_TITLE 841#ifndef SMART_WINDOW_TITLE
728 XStoreName(display->display, TermWin.parent[0], str); 842 XStoreName (display->display, TermWin.parent[0], str);
729#else 843#else
730 char *name; 844 char *name;
731 845
732 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
733 name = NULL; 847 name = NULL;
734 if (name == NULL || STRCMP(name, str)) 848 if (name == NULL || STRCMP (name, str))
735 XStoreName(display->display, TermWin.parent[0], str); 849 XStoreName (display->display, TermWin.parent[0], str);
736 if (name) 850 if (name)
737 XFree(name); 851 XFree (name);
738#endif 852#endif
739} 853}
740 854
741void 855void
742rxvt_term::set_iconName (const char *str) 856rxvt_term::set_iconName (const char *str)
743{ 857{
744#ifndef SMART_WINDOW_TITLE 858#ifndef SMART_WINDOW_TITLE
745 XSetIconName(display->display, TermWin.parent[0], str); 859 XSetIconName (display->display, TermWin.parent[0], str);
746#else 860#else
747 char *name; 861 char *name;
748 862
749 if (XGetIconName(display->display, TermWin.parent[0], &name)) 863 if (XGetIconName (display->display, TermWin.parent[0], &name))
750 name = NULL; 864 name = NULL;
751 if (name == NULL || STRCMP(name, str)) 865 if (name == NULL || STRCMP (name, str))
752 XSetIconName(display->display, TermWin.parent[0], str); 866 XSetIconName (display->display, TermWin.parent[0], str);
753 if (name) 867 if (name)
754 XFree(name); 868 XFree (name);
755#endif 869#endif
756} 870}
757 871
758#ifdef XTERM_COLOR_CHANGE 872#ifdef XTERM_COLOR_CHANGE
759void 873void
760rxvt_term::set_window_color (int idx, const char *color) 874rxvt_term::set_window_color (int idx, const char *color)
761{ 875{
762 rxvt_color xcol; 876 rxvt_color xcol;
763 int i; 877 int i;
764 878
765 if (color == NULL || *color == '\0') 879 if (color == NULL || *color == '\0')
766 return; 880 return;
767 881
768 /* handle color aliases */ 882 /* handle color aliases */
769 if (isdigit(*color)) 883 if (isdigit (*color))
770 { 884 {
771 i = atoi(color); 885 i = atoi (color);
772 if (i >= 8 && i <= 15) 886 if (i >= 8 && i <= 15)
773 { /* bright colors */ 887 { /* bright colors */
774 i -= 8; 888 i -= 8;
775# ifndef NO_BRIGHTCOLOR 889# ifndef NO_BRIGHTCOLOR
776 PixColors[idx] = PixColors[minBrightCOLOR + i]; 890 PixColors[idx] = PixColors[minBrightCOLOR + i];
777 SET_PIXCOLOR(idx); 891 SET_PIXCOLOR (idx);
778 goto Done; 892 goto Done;
779# endif 893# endif
780 894
781 } 895 }
782 if (i >= 0 && i <= 7) 896 if (i >= 0 && i <= 7)
783 { /* normal colors */ 897 { /* normal colors */
784 PixColors[idx] = PixColors[minCOLOR + i]; 898 PixColors[idx] = PixColors[minCOLOR + i];
785 SET_PIXCOLOR(idx); 899 SET_PIXCOLOR (idx);
786 goto Done; 900 goto Done;
787 } 901 }
788 } 902 }
789 if (!rXParseAllocColor (& xcol, color)) 903 if (!rXParseAllocColor (& xcol, color))
790 return; 904 return;
… …
799 if (PixColors[idx] == PixColors[i]) 913 if (PixColors[idx] == PixColors[i])
800 break; 914 break;
801 if (i > Color_White) 915 if (i > Color_White)
802 { 916 {
803 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 917 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
804 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 918 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
805 DisplayPlanes(display->display, display->screen)); 919 DisplayPlanes (display->display, display->screen));
806 } 920 }
807# endif 921# endif
808 922
809 PixColors[idx] = xcol; 923 PixColors[idx] = xcol;
810 SET_PIXCOLOR(idx); 924 SET_PIXCOLOR (idx);
811 925
812 /* XSetWindowAttributes attr; */ 926 /* XSetWindowAttributes attr; */
813 /* Cursor cursor; */ 927 /* Cursor cursor; */
814Done: 928Done:
815 if (idx == Color_bg && !(Options & Opt_transparent)) 929 if (idx == Color_bg && ! (Options & Opt_transparent))
816 XSetWindowBackground(display->display, TermWin.vt, 930 XSetWindowBackground (display->display, TermWin.vt,
817 PixColors[Color_bg]); 931 PixColors[Color_bg]);
818 932
819 /* handle Color_BD, scrollbar background, etc. */ 933 /* handle Color_BD, scrollbar background, etc. */
820 934
821 set_colorfgbg (); 935 set_colorfgbg ();
… …
835 rxvt_color xcol[2]; 949 rxvt_color xcol[2];
836 950
837 xcol[0] = PixColors[Color_pointer]; 951 xcol[0] = PixColors[Color_pointer];
838 xcol[1] = PixColors[Color_bg]; 952 xcol[1] = PixColors[Color_bg];
839 XQueryColors (display->display, XCMAP, xcol, 2); 953 XQueryColors (display->display, XCMAP, xcol, 2);
840 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 954 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
841#endif 955#endif
842} 956}
843 957
844/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
845/* 959/*
… …
848void 962void
849rxvt_term::set_colorfgbg () 963rxvt_term::set_colorfgbg ()
850{ 964{
851 unsigned int i; 965 unsigned int i;
852 const char *xpmb = "\0"; 966 const char *xpmb = "\0";
853 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 967 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
854 968
855 env_colorfgbg = 969 env_colorfgbg =
856 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 970 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
857 STRCPY(fstr, "default"); 971 STRCPY (fstr, "default");
858 STRCPY(bstr, "default"); 972 STRCPY (bstr, "default");
859 for (i = Color_Black; i <= Color_White; i++) 973 for (i = Color_Black; i <= Color_White; i++)
860 if (PixColors[Color_fg] == PixColors[i]) 974 if (PixColors[Color_fg] == PixColors[i])
861 { 975 {
862 sprintf(fstr, "%d", (i - Color_Black)); 976 sprintf (fstr, "%d", (i - Color_Black));
863 break; 977 break;
864 } 978 }
865 for (i = Color_Black; i <= Color_White; i++) 979 for (i = Color_Black; i <= Color_White; i++)
866 if (PixColors[Color_bg] == PixColors[i]) 980 if (PixColors[Color_bg] == PixColors[i])
867 { 981 {
868 sprintf(bstr, "%d", (i - Color_Black)); 982 sprintf (bstr, "%d", (i - Color_Black));
869#ifdef XPM_BACKGROUND 983#ifdef XPM_BACKGROUND
870 xpmb = "default;"; 984 xpmb = "default;";
871#endif 985#endif
872 break; 986 break;
873 } 987 }
988
874 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 989 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
875 putenv(env_colorfgbg);
876 990
877#ifndef NO_BRIGHTCOLOR 991#ifndef NO_BRIGHTCOLOR
878 colorfgbg = DEFAULT_RSTYLE; 992 colorfgbg = DEFAULT_RSTYLE;
879 for (i = minCOLOR; i <= maxCOLOR; i++) 993 for (i = minCOLOR; i <= maxCOLOR; i++)
880 { 994 {
881 if (PixColors[Color_fg] == PixColors[i]) 995 if (PixColors[Color_fg] == PixColors[i])
882 colorfgbg = SET_FGCOLOR(colorfgbg, i); 996 colorfgbg = SET_FGCOLOR (colorfgbg, i);
883 if (PixColors[Color_bg] == PixColors[i]) 997 if (PixColors[Color_bg] == PixColors[i])
884 colorfgbg = SET_BGCOLOR(colorfgbg, i); 998 colorfgbg = SET_BGCOLOR (colorfgbg, i);
885 } 999 }
886#endif 1000#endif
887} 1001}
888 1002
889/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
… …
895int 1009int
896rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
897{ 1011{
898 if (!screen_in_out->set (display, colour)) 1012 if (!screen_in_out->set (display, colour))
899 { 1013 {
900 rxvt_print_error("can't allocate colour: %s", colour); 1014 rxvt_print_error ("can't allocate colour: %s", colour);
901 return false; 1015 return false;
902 } 1016 }
903 1017
904 return true; 1018 return true;
905} 1019}
… …
985 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
986 1100
987 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
988 window_vt_y, TermWin_TotalWidth (), 1102 window_vt_y, TermWin_TotalWidth (),
989 TermWin_TotalHeight ()); 1103 TermWin_TotalHeight ());
990#ifdef RXVT_GRAPHICS 1104 scr_clear (height != old_height);
991 if (old_height)
992 Gr_Resize (old_width - szHint.base_width,
993 old_height - szHint.base_height);
994#endif
995 scr_clear ();
996#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
997 resize_pixmap (); 1106 resize_pixmap ();
998#endif 1107#endif
999 1108
1000 } 1109 }
… …
1011 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1120 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1012 curr_screen = scr_change_screen (PRIMARY); 1121 curr_screen = scr_change_screen (PRIMARY);
1013 TermWin.ncol = ncol; 1122 TermWin.ncol = ncol;
1014 } 1123 }
1015 1124
1016 scr_reset(); 1125 scr_reset ();
1017 1126
1018 if (curr_screen >= 0) /* this is not the first time through */ 1127 if (curr_screen >= 0) /* this is not the first time through */
1019 { 1128 {
1020 scr_change_screen (curr_screen); 1129 scr_change_screen (curr_screen);
1021 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1130 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1039{ 1148{
1040 XWindowAttributes wattr; 1149 XWindowAttributes wattr;
1041 1150
1042 if (width == 0 || height == 0) 1151 if (width == 0 || height == 0)
1043 { 1152 {
1044 XGetWindowAttributes(display->display, display->root, &wattr); 1153 XGetWindowAttributes (display->display, display->root, &wattr);
1045 if (width == 0) 1154 if (width == 0)
1046 width = wattr.width - szHint.base_width; 1155 width = wattr.width - szHint.base_width;
1047 if (height == 0) 1156 if (height == 0)
1048 height = wattr.height - szHint.base_height; 1157 height = wattr.height - szHint.base_height;
1049 } 1158 }
… …
1057 1166
1058/* -------------------------------------------------------------------- * 1167/* -------------------------------------------------------------------- *
1059 * - X INPUT METHOD ROUTINES - * 1168 * - X INPUT METHOD ROUTINES - *
1060 * -------------------------------------------------------------------- */ 1169 * -------------------------------------------------------------------- */
1061#ifdef USE_XIM 1170#ifdef USE_XIM
1171
1062void 1172void
1063rxvt_term::set_size (XRectangle *size) 1173rxvt_term::im_set_size (XRectangle *size)
1064{ 1174{
1065 size->x = TermWin.int_bwidth; 1175 size->x = TermWin.int_bwidth;
1066 size->y = TermWin.int_bwidth; 1176 size->y = TermWin.int_bwidth;
1067 size->width = Width2Pixel(TermWin.ncol); 1177 size->width = Width2Pixel (TermWin.ncol);
1068 size->height = Height2Pixel(TermWin.nrow); 1178 size->height = Height2Pixel (TermWin.nrow);
1069} 1179}
1070 1180
1071void 1181void
1072rxvt_term::set_color (unsigned long *fg, unsigned long *bg) 1182rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1073{ 1183{
1074 *fg = PixColors[Color_fg]; 1184 *fg = PixColors[Color_fg];
1075 *bg = PixColors[Color_bg]; 1185 *bg = PixColors[Color_bg];
1076} 1186}
1077 1187
… …
1083 Atom atom; 1193 Atom atom;
1084 Window win; 1194 Window win;
1085 char server[IMBUFSIZ]; 1195 char server[IMBUFSIZ];
1086 1196
1087 /* get current locale modifier */ 1197 /* get current locale modifier */
1088 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1198 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1089 { 1199 {
1090 STRCPY(server, "@server="); 1200 STRCPY (server, "@server=");
1091 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1092 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1202 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1093 *p = '\0'; 1203 *p = '\0';
1094 1204
1095 atom = XInternAtom(display->display, server, False); 1205 atom = XInternAtom (display->display, server, False);
1096 win = XGetSelectionOwner(display->display, atom); 1206 win = XGetSelectionOwner (display->display, atom);
1097 if (win != None) 1207 if (win != None)
1098 return True; 1208 return True;
1099 } 1209 }
1100 return False; 1210 return False;
1101} 1211}
… …
1105{ 1215{
1106 XPoint spot; 1216 XPoint spot;
1107 XVaNestedList preedit_attr; 1217 XVaNestedList preedit_attr;
1108 1218
1109 if (Input_Context == NULL 1219 if (Input_Context == NULL
1110 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1220 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1111 || !(event_type == KeyPress 1221 || ! (event_type == KeyPress
1112 || event_type == Expose 1222 || event_type == Expose
1113 || event_type == NoExpose 1223 || event_type == NoExpose
1114 || event_type == SelectionNotify 1224 || event_type == SelectionNotify
1115 || event_type == ButtonRelease || event_type == FocusIn) 1225 || event_type == ButtonRelease || event_type == FocusIn)
1116 || !IMisRunning ()) 1226 || !IMisRunning ())
1117 return; 1227 return;
1118 1228
1119 set_position (&spot); 1229 im_set_position (&spot);
1120 1230
1121 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1231 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1122 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1232 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1123 XFree(preedit_attr); 1233 XFree (preedit_attr);
1124} 1234}
1125 1235
1126void 1236void
1127rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1237rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1128 XRectangle * needed_rect) 1238 XRectangle * needed_rect)
1129{ 1239{
1130 int mbh, vtx = 0; 1240 int mbh, vtx = 0;
1131 1241
1132 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1242 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1133 vtx = scrollbar_TotalWidth(); 1243 vtx = scrollbar_TotalWidth ();
1134 1244
1135 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1245 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1136 mbh -= TermWin.lineSpace; 1246 mbh -= TermWin.lineSpace;
1137 1247
1138 preedit_rect->x = needed_rect->width + vtx; 1248 preedit_rect->x = needed_rect->width + vtx;
1139 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1249 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1140 1250
1141 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1251 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1142 preedit_rect->height = Height2Pixel(1); 1252 preedit_rect->height = Height2Pixel (1);
1143 1253
1144 status_rect->x = vtx; 1254 status_rect->x = vtx;
1145 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1255 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1146 1256
1147 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1257 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1148 status_rect->height = Height2Pixel(1); 1258 status_rect->height = Height2Pixel (1);
1149} 1259}
1150 1260
1151/* ARGSUSED */
1152/* EXTPROTO */
1153void 1261void
1154rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1262rxvt_term::im_destroy ()
1155 __attribute__ ((unused)), XPointer call_data
1156 __attribute__ ((unused)))
1157{ 1263{
1264 if (Input_Context)
1265 {
1266 XDestroyIC (Input_Context);
1158 GET_R->Input_Context = NULL; 1267 Input_Context = NULL;
1159 /* To avoid Segmentation Fault in C locale: Solaris only? */ 1268 }
1160 if (STRCMP (GET_R->locale, "C")) 1269
1161 XRegisterIMInstantiateCallback(GET_R->display->display, NULL, NULL, NULL, 1270 if (input_method)
1162 rxvt_IMInstantiateCallback, NULL); 1271 {
1272 display->put_xim (input_method);
1273 input_method = 0;
1274 }
1163} 1275}
1164 1276
1165/* 1277/*
1166 * Try to open a XIM with the current modifiers, then see if we can 1278 * Try to open a XIM with the current modifiers, then see if we can
1167 * open a suitable preedit type 1279 * open a suitable preedit type
1168 */ 1280 */
1169bool 1281bool
1170rxvt_term::IM_get_IC () 1282rxvt_term::IM_get_IC (const char *modifiers)
1171{ 1283{
1172 int i, j, found; 1284 int i, j, found;
1173 XIM xim; 1285 XIM xim;
1174 XPoint spot; 1286 XPoint spot;
1175 XRectangle rect, status_rect, needed_rect; 1287 XRectangle rect, status_rect, needed_rect;
1176 unsigned long fg, bg; 1288 unsigned long fg, bg;
1177 const char *p; 1289 const char *p;
1178 char **s; 1290 char **s;
1179 XIMStyles *xim_styles; 1291 XIMStyles *xim_styles;
1180 XVaNestedList preedit_attr, status_attr; 1292 XVaNestedList preedit_attr, status_attr;
1181 XIMCallback ximcallback;
1182 1293
1294 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1295 return false;
1296
1183 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1297 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1184 xim = XOpenIM (display->display, NULL, NULL, NULL); 1298 input_method = display->get_xim (locale, modifiers);
1185 if (xim == NULL) 1299 if (input_method == NULL)
1186 return False; 1300 return false;
1301
1302 xim = input_method->xim;
1187 1303
1188 xim_styles = NULL; 1304 xim_styles = NULL;
1189 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1305 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1190 || !xim_styles || !xim_styles->count_styles) 1306 || !xim_styles || !xim_styles->count_styles)
1191 { 1307 {
1192 XCloseIM(xim); 1308 display->put_xim (input_method);
1193 return False; 1309 return false;
1194 } 1310 }
1195 1311
1196 p = rs[Rs_preeditType] ? rs[Rs_preeditType] 1312 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1197 : "OverTheSpot,OffTheSpot,Root";
1198 s = rxvt_splitcommastring(p); 1313 s = rxvt_splitcommastring (p);
1199 for (i = found = 0; !found && s[i]; i++) 1314 for (i = found = 0; !found && s[i]; i++)
1200 { 1315 {
1201 if (!STRCMP(s[i], "OverTheSpot")) 1316 if (!STRCMP (s[i], "OverTheSpot"))
1202 input_style = (XIMPreeditPosition | XIMStatusNothing); 1317 input_style = (XIMPreeditPosition | XIMStatusNothing);
1203 else if (!STRCMP(s[i], "OffTheSpot")) 1318 else if (!STRCMP (s[i], "OffTheSpot"))
1204 input_style = (XIMPreeditArea | XIMStatusArea); 1319 input_style = (XIMPreeditArea | XIMStatusArea);
1205 else if (!STRCMP(s[i], "Root")) 1320 else if (!STRCMP (s[i], "Root"))
1206 input_style = (XIMPreeditNothing | XIMStatusNothing); 1321 input_style = (XIMPreeditNothing | XIMStatusNothing);
1207 1322
1208 for (j = 0; j < xim_styles->count_styles; j++) 1323 for (j = 0; j < xim_styles->count_styles; j++)
1209 if (input_style == xim_styles->supported_styles[j]) 1324 if (input_style == xim_styles->supported_styles[j])
1210 { 1325 {
1211 found = 1; 1326 found = 1;
1212 break; 1327 break;
1213 } 1328 }
1214 } 1329 }
1330
1215 for (i = 0; s[i]; i++) 1331 for (i = 0; s[i]; i++)
1216 free(s[i]); 1332 free (s[i]);
1333
1217 free(s); 1334 free (s);
1218 XFree(xim_styles); 1335 XFree (xim_styles);
1219 1336
1220 if (!found) 1337 if (!found)
1221 { 1338 {
1222 XCloseIM(xim); 1339 display->put_xim (input_method);
1223 return False; 1340 return false;
1224 } 1341 }
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 1342
1231 preedit_attr = status_attr = NULL; 1343 preedit_attr = status_attr = NULL;
1232 1344
1233 if (input_style & XIMPreeditPosition) 1345 if (input_style & XIMPreeditPosition)
1234 { 1346 {
1235 set_size (&rect); 1347 im_set_size (&rect);
1236 set_position (&spot); 1348 im_set_position (&spot);
1237 set_color (&fg, &bg); 1349 im_set_color (&fg, &bg);
1238 1350
1239 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1351 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1240 XNSpotLocation, &spot, 1352 XNSpotLocation, &spot,
1241 XNForeground, fg, XNBackground, bg, 1353 XNForeground, fg, XNBackground, bg,
1242 //XNFontSet, TermWin.fontset, 1354 //XNFontSet, TermWin.fontset,
1243 NULL); 1355 NULL);
1244 } 1356 }
1245 else if (input_style & XIMPreeditArea) 1357 else if (input_style & XIMPreeditArea)
1246 { 1358 {
1247 set_color (&fg, &bg); 1359 im_set_color (&fg, &bg);
1248 1360
1249 /* 1361 /*
1250 * The necessary width of preedit area is unknown 1362 * The necessary width of preedit area is unknown
1251 * until create input context. 1363 * until create input context.
1252 */ 1364 */
1253 needed_rect.width = 0; 1365 needed_rect.width = 0;
1254 1366
1255 set_preedit_area(&rect, &status_rect, &needed_rect); 1367 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1256 1368
1257 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1369 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1258 XNForeground, fg, XNBackground, bg, 1370 XNForeground, fg, XNBackground, bg,
1259 //XNFontSet, TermWin.fontset, 1371 //XNFontSet, TermWin.fontset,
1260 NULL); 1372 NULL);
1261 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1373 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1262 XNForeground, fg, XNBackground, bg, 1374 XNForeground, fg, XNBackground, bg,
1263 //XNFontSet, TermWin.fontset, 1375 //XNFontSet, TermWin.fontset,
1264 NULL); 1376 NULL);
1265 } 1377 }
1378
1266 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1379 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1267 XNClientWindow, TermWin.parent[0], 1380 XNClientWindow, TermWin.parent[0],
1268 XNFocusWindow, TermWin.parent[0], 1381 XNFocusWindow, TermWin.parent[0],
1269 XNDestroyCallback, &ximcallback,
1270 preedit_attr ? XNPreeditAttributes : NULL, 1382 preedit_attr ? XNPreeditAttributes : NULL,
1271 preedit_attr, 1383 preedit_attr,
1272 status_attr ? XNStatusAttributes : NULL, 1384 status_attr ? XNStatusAttributes : NULL,
1273 status_attr, NULL); 1385 status_attr, NULL);
1274 if (preedit_attr) 1386 if (preedit_attr) XFree (preedit_attr);
1275 XFree(preedit_attr); 1387 if (status_attr) XFree (status_attr);
1276 if (status_attr) 1388
1277 XFree(status_attr);
1278 if (Input_Context == NULL) 1389 if (Input_Context == NULL)
1279 { 1390 {
1280 rxvt_print_error("failed to create input context"); 1391 rxvt_print_error ("failed to create input context");
1281 XCloseIM(xim); 1392 display->put_xim (input_method);
1282 return False; 1393 return false;
1283 } 1394 }
1395
1284 if (input_style & XIMPreeditArea) 1396 if (input_style & XIMPreeditArea)
1285 IMSetStatusPosition (); 1397 IMSetStatusPosition ();
1398
1286 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1399 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1287 return True; 1400 return true;
1288} 1401}
1289 1402
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 1403void
1299rxvt_IMInstantiateCallback(Display * unused 1404rxvt_term::im_cb ()
1300 __attribute__ ((unused)), XPointer client_data
1301 __attribute__ ((unused)), XPointer call_data
1302 __attribute__ ((unused)))
1303{ 1405{
1304 int i, found, had_im; 1406 int i, found, had_im;
1305 const char *p; 1407 const char *p;
1306 char **s; 1408 char **s;
1307 char buf[IMBUFSIZ]; 1409 char buf[IMBUFSIZ];
1308 1410
1411 im_destroy ();
1412
1309 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1413 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1310 if (GET_R->Input_Context) 1414 if (Input_Context)
1311 return; 1415 return;
1312 1416
1313#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1417#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1314 if (GET_R->rs[Rs_imLocale]) 1418 if (rs[Rs_imLocale])
1315 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]); 1419 SET_LOCALE (rs[Rs_imLocale]);
1316#endif 1420#endif
1317 1421
1318 p = GET_R->rs[Rs_inputMethod]; 1422 p = rs[Rs_inputMethod];
1319 if (p && *p) 1423 if (p && *p)
1320 { 1424 {
1321 bool found = false; 1425 bool found = false;
1322 1426
1323 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
… …
1325 { 1429 {
1326 if (*s[i]) 1430 if (*s[i])
1327 { 1431 {
1328 STRCPY (buf, "@im="); 1432 STRCPY (buf, "@im=");
1329 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1433 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1330 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ()) 1434 if (IM_get_IC (buf))
1331 { 1435 {
1332 found = true; 1436 found = true;
1333 break; 1437 break;
1334 } 1438 }
1335 } 1439 }
1336 } 1440 }
1337 for (i = 0; s[i]; i++) 1441 for (i = 0; s[i]; i++)
1338 free(s[i]); 1442 free (s[i]);
1339 free(s); 1443 free (s);
1340 1444
1341 if (found) 1445 if (found)
1342 goto done; 1446 goto done;
1343 } 1447 }
1344 1448
1345 /* try with XMODIFIERS env. var. */ 1449 /* try with XMODIFIERS env. var. */
1346 if ((p = XSetLocaleModifiers ("")) && *p 1450 if (IM_get_IC (""))
1347 && GET_R->IM_get_IC ())
1348 goto done; 1451 goto done;
1349 1452
1350 /* try with no modifiers base IF the user didn't specify an IM */ 1453 /* try with no modifiers base IF the user didn't specify an IM */
1351 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1454 if (IM_get_IC ("@im=none"))
1352 && GET_R->IM_get_IC () == True)
1353 goto done; 1455 goto done;
1354 1456
1355done: 1457done:
1356#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1458#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1357 if (GET_R->rs[Rs_imLocale]) 1459 if (rs[Rs_imLocale])
1358 setlocale (LC_CTYPE, GET_R->locale); 1460 SET_LOCALE (locale);
1359#endif 1461#endif
1360} 1462}
1361 1463
1362void 1464void
1363rxvt_term::IMSetStatusPosition () 1465rxvt_term::IMSetStatusPosition ()
1364{ 1466{
1365 XRectangle preedit_rect, status_rect, *needed_rect; 1467 XRectangle preedit_rect, status_rect, *needed_rect;
1366 XVaNestedList preedit_attr, status_attr; 1468 XVaNestedList preedit_attr, status_attr;
1367 1469
1368 if (Input_Context == NULL 1470 if (Input_Context == NULL
1369 || !TermWin.focus || !(input_style & XIMPreeditArea) 1471 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1370 || !IMisRunning ()) 1472 || !IMisRunning ())
1371 return; 1473 return;
1372 1474
1373 /* Getting the necessary width of preedit area */ 1475 /* Getting the necessary width of preedit area */
1374 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1476 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1375 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1477 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1376 XFree(status_attr); 1478 XFree (status_attr);
1377 1479
1378 set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1480 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1379 1481
1380 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1482 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1381 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1483 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1382 1484
1383 XSetICValues(Input_Context, 1485 XSetICValues (Input_Context,
1384 XNPreeditAttributes, preedit_attr, 1486 XNPreeditAttributes, preedit_attr,
1385 XNStatusAttributes, status_attr, NULL); 1487 XNStatusAttributes, status_attr, NULL);
1386 1488
1387 XFree(preedit_attr); 1489 XFree (preedit_attr);
1388 XFree(status_attr); 1490 XFree (status_attr);
1389} 1491}
1390#endif /* USE_XIM */ 1492#endif /* USE_XIM */
1391 1493
1392/*----------------------------------------------------------------------*/ 1494/*----------------------------------------------------------------------*/
1393rxvt_t rxvt_current_term; 1495rxvt_t rxvt_current_term;

Diff Legend

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