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

Diff Legend

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