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.24 by pcg, Sat Jan 31 03:26:28 2004 UTC vs.
Revision 1.48 by pcg, Wed Mar 3 04:07:52 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.24 2004/01/31 03:26:28 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * 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
19 * 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
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
72{ 72{
73 free (p); 73 free (p);
74} 74}
75 75
76rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77: 77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
78#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
79 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
80#endif 89#endif
81#ifdef TEXT_BLINK 90#ifdef TEXT_BLINK
82 text_blink_ev (this, &rxvt_term::text_blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
83#endif 92#endif
84#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
85 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
86#endif 95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
98#endif
87 check_ev (this, &rxvt_term::check_cb), 99 check_ev (this, &rxvt_term::check_cb),
88 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
89 pty_ev (this, &rxvt_term::pty_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
90 x_ev (this, &rxvt_term::x_cb),
91 incr_ev (this, &rxvt_term::incr_cb) 102 incr_ev (this, &rxvt_term::incr_cb)
92{ 103{
93 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
94} 105}
95 106
96rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
97{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
130 if (TermWin.parent[0])
131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
133
134 // TODO: free pixcolours, colours should become part of rxvt_display
135
136 delete PixColors;
137
138 displays.put (display);
139
98 scr_release (); 140 scr_release ();
99 141
142 free (env_windowid);
143 free (env_display);
144 free (env_term);
145 free (env_colorfgbg);
100 free (locale); 146 free (locale);
101 free (codeset); 147 free (codeset);
102 148
103#ifndef NO_SETOWNER_TTYDEV 149 delete envv;
104 privileged_ttydev (RESTORE); 150 delete argv;
105#endif 151}
106#ifdef UTMP_SUPPORT 152
107 privileged_utmp (RESTORE); 153void
108#endif 154rxvt_term::destroy ()
155{
156 if (display)
157 {
158 rootwin_ev.stop (display);
159 termwin_ev.stop (display);
160 vt_ev.stop (display);
109#ifdef USE_XIM 161#ifdef USE_XIM
110 if (Input_Context != NULL) 162 im_destroy ();
163 im_ev.stop (display);
164#endif
165#ifdef HAVE_SCROLLBARS
166 scrollbar_ev.stop (display);
167#endif
168#ifdef MENUBAR
169 menubar_ev.stop (display);
170#endif
111 { 171 }
112 XDestroyIC (Input_Context);
113 Input_Context = NULL;
114 }
115#endif
116 172
117 if (cmd_fd >= 0)
118 close (cmd_fd);
119
120 if (Xfd >= 0)
121 XCloseDisplay (Xdisplay);
122
123 delete PixColors;
124}
125
126void
127rxvt_term::destroy ()
128{
129 check_ev.stop (); 173 check_ev.stop ();
130 pty_ev.stop (); 174 pty_ev.stop ();
131 x_ev.stop ();
132#ifdef CURSOR_BLINK 175#ifdef CURSOR_BLINK
133 cursor_blink_ev.stop (); 176 cursor_blink_ev.stop ();
134#endif 177#endif
135#ifdef TEXT_BLINK 178#ifdef TEXT_BLINK
136 text_blink_ev.stop (); 179 text_blink_ev.stop ();
… …
149 192
150 delete this; 193 delete this;
151} 194}
152 195
153/*----------------------------------------------------------------------*/ 196/*----------------------------------------------------------------------*/
154/* rxvt_init() */ 197/* rxvt_init () */
155/* LIBPROTO */ 198/* LIBPROTO */
156rxvt_t 199rxvt_t
157rxvt_init (int argc, const char *const *argv) 200rxvt_init (int argc, const char *const *argv)
158{ 201{
159 SET_R (new rxvt_term); 202 SET_R (new rxvt_term);
… …
165 } 208 }
166 209
167 return GET_R; 210 return GET_R;
168} 211}
169 212
213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
170void 215void
171rxvt_init_signals () 216rxvt_init_signals ()
172{ 217{
173/* install exit handler for cleanup */ 218 /* install exit handler for cleanup */
174#if 0 219#if 0
175#ifdef HAVE_ATEXIT 220#ifdef HAVE_ATEXIT
176 atexit(rxvt_clean_exit); 221 atexit (rxvt_clean_exit);
177#else 222#else
178#endif 223#endif
179#endif 224#endif
180 225
181 struct sigaction sa; 226 struct sigaction sa;
… …
187 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
189 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
190 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
191 236
192/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
193/* signal (SIGURG, SIG_DFL); */ 238 /* signal (SIGURG, SIG_DFL); */
194 239
195 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
196 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
197} 242}
198 243
199bool 244bool
200rxvt_term::init (int argc, const char *const *argv) 245rxvt_term::init (int argc, const char *const *argv)
… …
213 258
214 const char **cmd_argv = init_resources (argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
215 260
216 set_locale (""); 261 set_locale ("");
217 262
218#if (MENUBAR_MAX) 263#if MENUBAR_MAX
219 menubar_read (rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
220#endif 265#endif
221#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
222 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
223 scrollBar.setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
… …
226 create_windows (argc, argv); 271 create_windows (argc, argv);
227 272
228 init_xlocale (); 273 init_xlocale ();
229 274
230 scr_reset (); /* initialize screen */ 275 scr_reset (); /* initialize screen */
231#ifdef RXVT_GRAPHICS
232 Gr_reset (); /* reset graphics */
233#endif
234 276
235#if 0 277#if 0
236#ifdef DEBUG_X
237 XSynchronize(Xdisplay, True); 278 XSynchronize (display->display, True);
238#endif
239#endif 279#endif
240 280
241#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
242 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
243 resize_scrollbar (); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
244#endif 284#endif
245#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
246 if (menubar_visible(r)) 286 if (menubar_visible ())
247 XMapWindow (Xdisplay, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
248#endif 288#endif
249#ifdef TRANSPARENT 289#ifdef TRANSPARENT
250 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
251 { 291 {
252 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 292 XSelectInput (display->display, display->root, PropertyChangeMask);
253 check_our_parents (); 293 check_our_parents ();
254 } 294 }
255#endif 295#endif
296
297 rootwin_ev.start (display, display->root);
298
256 XMapWindow (Xdisplay, TermWin.vt); 299 XMapWindow (display->display, TermWin.vt);
257 XMapWindow (Xdisplay, TermWin.parent[0]); 300 XMapWindow (display->display, TermWin.parent[0]);
258 301
259 init_env ();
260 init_command (cmd_argv); 302 init_command (cmd_argv);
261 303
262 x_ev.start (Xfd, EVENT_READ);
263 pty_ev.start (cmd_fd, EVENT_READ); 304 pty_ev.start (cmd_fd, EVENT_READ);
264 305
265 check_ev.start (); 306 check_ev.start ();
266
267 process_x_events ();
268 307
269 return true; 308 return true;
270} 309}
271 310
272/* ------------------------------------------------------------------------- * 311/* ------------------------------------------------------------------------- *
… …
276 * Catch a SIGCHLD signal and exit if the direct child has died 315 * Catch a SIGCHLD signal and exit if the direct child has died
277 */ 316 */
278/* ARGSUSED */ 317/* ARGSUSED */
279/* EXTPROTO */ 318/* EXTPROTO */
280RETSIGTYPE 319RETSIGTYPE
281rxvt_Child_signal(int sig __attribute__ ((unused))) 320rxvt_Child_signal (int sig __attribute__ ((unused)))
282{ 321{
283 int pid, save_errno = errno; 322 int pid, save_errno = errno;
284 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
285 ; 324 ;
286 errno = save_errno; 325 errno = save_errno;
287 326
288#if 0 327#if 0
289 if (pid == cmd_pid) 328 if (pid == cmd_pid)
290 exit (EXIT_SUCCESS); 329 exit (EXIT_SUCCESS);
291#endif 330#endif
292} 331}
293 332
294/* 333/*
295 * Catch a fatal signal and tidy up before quitting 334 * Catch a fatal signal and tidy up before quitting
296 */ 335 */
297/* EXTPROTO */ 336/* EXTPROTO */
298RETSIGTYPE 337RETSIGTYPE
299rxvt_Exit_signal(int sig) 338rxvt_Exit_signal (int sig)
300{ 339{
301 signal(sig, SIG_DFL); 340 signal (sig, SIG_DFL);
302#ifdef DEBUG_CMD 341#ifdef DEBUG_CMD
303 rxvt_print_error("signal %d", sig); 342 rxvt_print_error ("signal %d", sig);
304#endif 343#endif
305 rxvt_clean_exit(); 344 rxvt_clean_exit ();
306 kill(getpid(), sig); 345 kill (getpid (), sig);
307} 346}
308 347
309/* ARGSUSED */
310/* EXTPROTO */ 348/* INTPROTO */
311int 349int
312rxvt_xerror_handler(const Display * display 350rxvt_xerror_handler (Display *display, XErrorEvent *event)
313 __attribute__ ((unused)), const XErrorEvent * event)
314{ 351{
315 if (GET_R->allowedxerror == -1) 352 if (GET_R->allowedxerror == -1)
316 GET_R->allowedxerror = event->error_code; 353 GET_R->allowedxerror = event->error_code;
317 else 354 else
318 { 355 {
319 rxvt_print_error("XError: Request: %d . %d, Error: %d", 356 old_xerror_handler (display, event);
320 event->request_code, event->minor_code,
321 event->error_code);
322
323 GET_R->destroy (); 357 GET_R->destroy ();
324 } 358 }
325 359
326 return 0; 360 return 0;
327} 361}
… …
333 */ 367 */
334/* EXTPROTO */ 368/* EXTPROTO */
335void 369void
336rxvt_clean_exit () 370rxvt_clean_exit ()
337{ 371{
372 // TODO: rxvtd should clean up all ressources
373 if (GET_R)
338 GET_R->destroy (); 374 GET_R->destroy ();
339} 375}
340 376
341/* ------------------------------------------------------------------------- * 377/* ------------------------------------------------------------------------- *
342 * MEMORY ALLOCATION WRAPPERS * 378 * MEMORY ALLOCATION WRAPPERS *
343 * ------------------------------------------------------------------------- */ 379 * ------------------------------------------------------------------------- */
344/* EXTPROTO */ 380/* EXTPROTO */
345void * 381void *
346rxvt_malloc(size_t size) 382rxvt_malloc (size_t size)
347{ 383{
348 void *p; 384 void *p;
349 385
350 p = malloc(size); 386 p = malloc (size);
351 if (p) 387 if (p)
352 return p; 388 return p;
353 389
354 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 390 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
355 rxvt_clean_exit(); 391 rxvt_clean_exit ();
356 exit(EXIT_FAILURE); 392 exit (EXIT_FAILURE);
357/* NOTREACHED */ 393 /* NOTREACHED */
358} 394}
359 395
360/* EXTPROTO */ 396/* EXTPROTO */
361void * 397void *
362rxvt_calloc(size_t number, size_t size) 398rxvt_calloc (size_t number, size_t size)
363{ 399{
364 void *p; 400 void *p;
365 401
366 p = calloc(number, size); 402 p = calloc (number, size);
367 if (p) 403 if (p)
368 return p; 404 return p;
369 405
370 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 406 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
371 rxvt_clean_exit(); 407 rxvt_clean_exit ();
372 exit(EXIT_FAILURE); 408 exit (EXIT_FAILURE);
373/* NOTREACHED */ 409 /* NOTREACHED */
374} 410}
375 411
376/* EXTPROTO */ 412/* EXTPROTO */
377void * 413void *
378rxvt_realloc(void *ptr, size_t size) 414rxvt_realloc (void *ptr, size_t size)
379{ 415{
380 void *p; 416 void *p;
381 417
382 if (ptr) 418 if (ptr)
383 p = realloc(ptr, size); 419 p = realloc (ptr, size);
384 else 420 else
385 p = malloc(size); 421 p = malloc (size);
386 if (p) 422 if (p)
387 return p; 423 return p;
388 424
389 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 425 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
390 rxvt_clean_exit(); 426 rxvt_clean_exit ();
391 exit(EXIT_FAILURE); 427 exit (EXIT_FAILURE);
392/* NOTREACHED */ 428 /* NOTREACHED */
393} 429}
394 430
395/* ------------------------------------------------------------------------- * 431/* ------------------------------------------------------------------------- *
396 * PRIVILEGED OPERATIONS * 432 * PRIVILEGED OPERATIONS *
397 * ------------------------------------------------------------------------- */ 433 * ------------------------------------------------------------------------- */
… …
399void 435void
400rxvt_term::privileges (int mode) 436rxvt_term::privileges (int mode)
401{ 437{
402#if ! defined(__CYGWIN32__) 438#if ! defined(__CYGWIN32__)
403# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
404/* setreuid() is the poor man's setuid(), seteuid() */ 440 /* setreuid () is the poor man's setuid (), seteuid () */
405# define seteuid(a) setreuid(-1, (a)) 441# define seteuid(a) setreuid(-1, (a))
406# define setegid(a) setregid(-1, (a)) 442# define setegid(a) setregid(-1, (a))
407# define HAVE_SETEUID 443# define HAVE_SETEUID
408# endif 444# endif
409# ifdef HAVE_SETEUID 445# ifdef HAVE_SETEUID
410 switch (mode) { 446 switch (mode)
447 {
411 case IGNORE: 448 case IGNORE:
412 /* 449 /*
413 * change effective uid/gid - not real uid/gid - so we can switch 450 * change effective uid/gid - not real uid/gid - so we can switch
414 * back to root later, as required 451 * back to root later, as required
415 */ 452 */
416 seteuid(getuid()); 453 seteuid (getuid ());
417 setegid(getgid()); 454 setegid (getgid ());
418 break; 455 break;
419 case SAVE: 456 case SAVE:
420 euid = geteuid(); 457 euid = geteuid ();
421 egid = getegid(); 458 egid = getegid ();
422 break; 459 break;
423 case RESTORE: 460 case RESTORE:
424 seteuid(euid); 461 seteuid (euid);
425 setegid(egid); 462 setegid (egid);
426 break; 463 break;
427 } 464 }
428# else 465# else
429 switch (mode) { 466 switch (mode)
467 {
430 case IGNORE: 468 case IGNORE:
431 setuid(getuid()); 469 setuid (getuid ());
432 setgid(getgid()); 470 setgid (getgid ());
433 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
434 case SAVE: 472 case SAVE:
435 /* FALLTHROUGH */ 473 /* FALLTHROUGH */
436 case RESTORE: 474 case RESTORE:
437 break; 475 break;
438 } 476 }
439# endif 477# endif
440#endif 478#endif
441} 479}
442 480
443#ifdef UTMP_SUPPORT 481#ifdef UTMP_SUPPORT
444void 482void
445rxvt_term::privileged_utmp (char action) 483rxvt_term::privileged_utmp (char action)
446{ 484{
447 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 485 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
448 action, next_utmp_action, getpid())); 486 action, next_utmp_action, getpid ()));
449 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
450 || (Options & Opt_utmpInhibit) 488 || (Options & Opt_utmpInhibit)
451 || ttydev == NULL || *ttydev == '\0') 489 || ttydev == NULL || *ttydev == '\0')
452 return; 490 return;
453 491
454 privileges (RESTORE); 492 privileges (RESTORE);
455 if (action == SAVE) { 493 if (action == SAVE)
494 {
456 next_utmp_action = RESTORE; 495 next_utmp_action = RESTORE;
457 makeutent (ttydev, rs[Rs_display_name]); 496 makeutent (ttydev, rs[Rs_display_name]);
497 }
498 else
458 } else { /* action == RESTORE */ 499 { /* action == RESTORE */
459 next_utmp_action = IGNORE; 500 next_utmp_action = IGNORE;
460 cleanutent (); 501 cleanutent ();
461 } 502 }
462 privileges (IGNORE); 503 privileges (IGNORE);
463} 504}
464#endif 505#endif
465 506
466#ifndef NO_SETOWNER_TTYDEV 507#ifndef NO_SETOWNER_TTYDEV
467void 508void
468rxvt_term::privileged_ttydev (char action) 509rxvt_term::privileged_ttydev (char action)
469{ 510{
470 D_MAIN((stderr, 511 D_MAIN ((stderr,
471 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
472 action, next_tty_action, getpid())); 513 action, next_tty_action, getpid ()));
473 if (next_tty_action != action || (action != SAVE && action != RESTORE) 514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
474 || ttydev == NULL || *ttydev == '\0') 515 || ttydev == NULL || *ttydev == '\0')
475 return; 516 return;
476 517
477 privileges (RESTORE); 518 privileges (RESTORE);
478 519
479 if (action == SAVE) { 520 if (action == SAVE)
521 {
480 next_tty_action = RESTORE; 522 next_tty_action = RESTORE;
481# ifndef RESET_TTY_TO_COMMON_DEFAULTS 523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
482/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 524 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
483 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
484 next_tty_action = IGNORE; 526 next_tty_action = IGNORE;
485 else 527 else
486# endif 528# endif
529
487 { 530 {
488 chown(ttydev, getuid(), ttygid); /* fail silently */ 531 chown (ttydev, getuid (), ttygid); /* fail silently */
489 chmod(ttydev, ttymode); 532 chmod (ttydev, ttymode);
490# ifdef HAVE_REVOKE 533# ifdef HAVE_REVOKE
491 revoke(ttydev); 534 revoke (ttydev);
492# endif 535# endif
536
493 } 537 }
538 }
539 else
494 } else { /* action == RESTORE */ 540 { /* action == RESTORE */
495 next_tty_action = IGNORE; 541 next_tty_action = IGNORE;
496# ifndef RESET_TTY_TO_COMMON_DEFAULTS 542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
497 chmod(ttydev, ttyfd_stat.st_mode); 543 chmod (ttydev, ttyfd_stat.st_mode);
498 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
499# else 545# else
500 chmod(ttydev, 546 chmod (ttydev,
501 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 547 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
502 chown(ttydev, 0, 0); 548 chown (ttydev, 0, 0);
503# endif 549# endif
504 }
505 550
551 }
552
506 privileges (IGNORE); 553 privileges (IGNORE);
507 554
508# ifndef RESET_TTY_TO_COMMON_DEFAULTS 555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
509 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
510 action == RESTORE ? "Restoring" : (action == 557 action == RESTORE ? "Restoring" : (action ==
511 SAVE ? "Saving" : 558 SAVE ? "Saving" :
512 "UNKNOWN ERROR for"), ttydev, 559 "UNKNOWN ERROR for"), ttydev,
513 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
514 ttyfd_stat.st_gid)); 561 ttyfd_stat.st_gid));
515# endif 562# endif
516} 563}
517#endif 564#endif
518 565
519/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
… …
522 * if width/height are non-zero then override calculated width/height 569 * if width/height are non-zero then override calculated width/height
523 */ 570 */
524void 571void
525rxvt_term::window_calc (unsigned int width, unsigned int height) 572rxvt_term::window_calc (unsigned int width, unsigned int height)
526{ 573{
527 short recalc_x, recalc_y; 574 short recalc_x, recalc_y;
528 int x, y, sb_w, mb_h, flags; 575 int x, y, sb_w, mb_h, flags;
529 unsigned int w, h; 576 unsigned int w, h;
530 unsigned int max_width, max_height; 577 unsigned int max_width, max_height;
531 578
532 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 579 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
533 TermWin.ncol, TermWin.nrow, szHint.width, 580 TermWin.ncol, TermWin.nrow, szHint.width,
534 szHint.height)); 581 szHint.height));
535 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 582 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
536 szHint.win_gravity = NorthWestGravity; 583 szHint.win_gravity = NorthWestGravity;
537/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 584 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
538 585
539 recalc_x = recalc_y = 0; 586 recalc_x = recalc_y = 0;
540 flags = 0; 587 flags = 0;
541 if (!parsed_geometry) { 588 if (!parsed_geometry)
589 {
542 parsed_geometry = 1; 590 parsed_geometry = 1;
543 if (rs[Rs_geometry]) 591 if (rs[Rs_geometry])
544 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 592 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
545 if (flags & WidthValue) { 593 if (flags & WidthValue)
594 {
546 TermWin.ncol = BOUND_POSITIVE_INT16(w); 595 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
547 szHint.flags |= USSize; 596 szHint.flags |= USSize;
548 } 597 }
549 if (flags & HeightValue) { 598 if (flags & HeightValue)
599 {
550 TermWin.nrow = BOUND_POSITIVE_INT16(h); 600 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
551 szHint.flags |= USSize; 601 szHint.flags |= USSize;
552 } 602 }
553 if (flags & XValue) { 603 if (flags & XValue)
604 {
554 szHint.x = x; 605 szHint.x = x;
555 szHint.flags |= USPosition; 606 szHint.flags |= USPosition;
556 if (flags & XNegative) { 607 if (flags & XNegative)
608 {
557 recalc_x = 1; 609 recalc_x = 1;
558 szHint.win_gravity = NorthEastGravity; 610 szHint.win_gravity = NorthEastGravity;
559 } 611 }
560 } 612 }
561 if (flags & YValue) { 613 if (flags & YValue)
614 {
562 szHint.y = y; 615 szHint.y = y;
563 szHint.flags |= USPosition; 616 szHint.flags |= USPosition;
564 if (flags & YNegative) { 617 if (flags & YNegative)
618 {
565 recalc_y = 1; 619 recalc_y = 1;
566 if (szHint.win_gravity == NorthEastGravity) 620 if (szHint.win_gravity == NorthEastGravity)
567 szHint.win_gravity = SouthEastGravity; 621 szHint.win_gravity = SouthEastGravity;
568 else 622 else
569 szHint.win_gravity = SouthWestGravity; 623 szHint.win_gravity = SouthWestGravity;
570 } 624 }
571 } 625 }
572 } 626 }
573/* TODO: BOUNDS */ 627 /* TODO: BOUNDS */
574 TermWin.width = TermWin.ncol * TermWin.fwidth; 628 TermWin.width = TermWin.ncol * TermWin.fwidth;
575 TermWin.height = TermWin.nrow * TermWin.fheight; 629 TermWin.height = TermWin.nrow * TermWin.fheight;
576 max_width = MAX_COLS * TermWin.fwidth; 630 max_width = MAX_COLS * TermWin.fwidth;
577 max_height = MAX_ROWS * TermWin.fheight; 631 max_height = MAX_ROWS * TermWin.fheight;
578 632
579 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
580 634
581 sb_w = mb_h = 0; 635 sb_w = mb_h = 0;
582 window_vt_x = window_vt_y = 0; 636 window_vt_x = window_vt_y = 0;
583 if (scrollbar_visible ()) { 637 if (scrollbar_visible ())
638 {
584 sb_w = scrollbar_TotalWidth(); 639 sb_w = scrollbar_TotalWidth ();
585 szHint.base_width += sb_w; 640 szHint.base_width += sb_w;
586 if (!(Options & Opt_scrollBar_right)) 641 if (! (Options & Opt_scrollBar_right))
587 window_vt_x = sb_w; 642 window_vt_x = sb_w;
588 } 643 }
589 if (menubar_visible ()) { 644 if (menubar_visible ())
645 {
590 mb_h = menuBar_TotalHeight(); 646 mb_h = menuBar_TotalHeight ();
591 szHint.base_height += mb_h; 647 szHint.base_height += mb_h;
592 window_vt_y = mb_h; 648 window_vt_y = mb_h;
593 } 649 }
594 szHint.width_inc = TermWin.fwidth; 650 szHint.width_inc = TermWin.fwidth;
595 szHint.height_inc = TermWin.fheight; 651 szHint.height_inc = TermWin.fheight;
596 szHint.min_width = szHint.base_width + szHint.width_inc; 652 szHint.min_width = szHint.base_width + szHint.width_inc;
597 szHint.min_height = szHint.base_height + szHint.height_inc; 653 szHint.min_height = szHint.base_height + szHint.height_inc;
598 654
599 if (width && width - szHint.base_width < max_width) { 655 if (width && width - szHint.base_width < max_width)
656 {
600 szHint.width = width; 657 szHint.width = width;
601 TermWin.width = width - szHint.base_width; 658 TermWin.width = width - szHint.base_width;
602 } else { 659 }
660 else
661 {
603 MIN_IT(TermWin.width, max_width); 662 MIN_IT (TermWin.width, max_width);
604 szHint.width = szHint.base_width + TermWin.width; 663 szHint.width = szHint.base_width + TermWin.width;
605 } 664 }
606 if (height && height - szHint.base_height < max_height) { 665 if (height && height - szHint.base_height < max_height)
666 {
607 szHint.height = height; 667 szHint.height = height;
608 TermWin.height = height - szHint.base_height; 668 TermWin.height = height - szHint.base_height;
609 } else { 669 }
670 else
671 {
610 MIN_IT(TermWin.height, max_height); 672 MIN_IT (TermWin.height, max_height);
611 szHint.height = szHint.base_height + TermWin.height; 673 szHint.height = szHint.base_height + TermWin.height;
612 } 674 }
613 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 675 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
614 window_sb_x = szHint.width - sb_w; 676 window_sb_x = szHint.width - sb_w;
615 677
616 if (recalc_x) 678 if (recalc_x)
617 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay)) 679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
618 - szHint.width - 2 * TermWin.ext_bwidth); 680 - szHint.width - 2 * TermWin.ext_bwidth);
619 if (recalc_y) 681 if (recalc_y)
620 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay)) 682 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
621 - szHint.height - 2 * TermWin.ext_bwidth); 683 - szHint.height - 2 * TermWin.ext_bwidth);
622 684
623 TermWin.ncol = TermWin.width / TermWin.fwidth; 685 TermWin.ncol = TermWin.width / TermWin.fwidth;
624 TermWin.nrow = TermWin.height / TermWin.fheight; 686 TermWin.nrow = TermWin.height / TermWin.fheight;
625 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 687 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 TermWin.ncol, TermWin.nrow, szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
627 szHint.height)); 689 szHint.height));
628 return; 690 return;
629} 691}
630 692
631/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
632/* 694/*
633 * Tell the teletype handler what size the window is. 695 * Tell the teletype handler what size the window is.
… …
646 ws.ws_xpixel = ws.ws_ypixel = 0; 708 ws.ws_xpixel = ws.ws_ypixel = 0;
647#ifndef DEBUG_SIZE 709#ifndef DEBUG_SIZE
648 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
649#else 711#else
650 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
651 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
652# ifdef SIGWINCH 714# ifdef SIGWINCH
653 else if (cmd_pid) /* force through to the command */ 715 else if (cmd_pid) /* force through to the command */
654 kill (cmd_pid, SIGWINCH); 716 kill (cmd_pid, SIGWINCH);
655# endif 717# endif
656#endif 718#endif
657} 719}
658 720
659/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
660/* rxvt_change_font() - Switch to a new font */ 722/* rxvt_change_font () - Switch to a new font */
661/* 723/*
662 * init = 1 - initialize 724 * init = 1 - initialize
663 * 725 *
664 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
665 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
666 */ 728 */
667void 729bool
668rxvt_term::change_font (int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
669{ 731{
670} 732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
671 743
672void 744 if (fs && fs->populate (fontname ? fontname : "fixed"))
745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
673rxvt_term::font_up_down (int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
674{ 768{
769 return false;
675} 770}
676 771
677/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
678/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
679/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
680void 775void
681rxvt_term::set_title (const char *str) 776rxvt_term::set_title (const char *str)
682{ 777{
683#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
684 XStoreName(Xdisplay, TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
685#else 780#else
686 char *name; 781 char *name;
687 782
688 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
689 name = NULL; 784 name = NULL;
690 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
691 XStoreName(Xdisplay, TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
692 if (name) 787 if (name)
693 XFree(name); 788 XFree (name);
694#endif 789#endif
695} 790}
696 791
697void 792void
698rxvt_term::set_iconName (const char *str) 793rxvt_term::set_iconName (const char *str)
699{ 794{
700#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
701 XSetIconName(Xdisplay, TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
702#else 797#else
703 char *name; 798 char *name;
704 799
705 if (XGetIconName(Xdisplay, TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
706 name = NULL; 801 name = NULL;
707 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
708 XSetIconName(Xdisplay, TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
709 if (name) 804 if (name)
710 XFree(name); 805 XFree (name);
711#endif 806#endif
712} 807}
713 808
714#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
715void 810void
716rxvt_term::set_window_color (int idx, const char *color) 811rxvt_term::set_window_color (int idx, const char *color)
717{ 812{
718 rxvt_color xcol; 813 rxvt_color xcol;
719 int i; 814 int i;
720 815
721 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
722 return; 817 return;
723 818
724/* handle color aliases */ 819 /* handle color aliases */
725 if (isdigit(*color)) { 820 if (isdigit (*color))
821 {
726 i = atoi(color); 822 i = atoi (color);
823 if (i >= 8 && i <= 15)
727 if (i >= 8 && i <= 15) { /* bright colors */ 824 { /* bright colors */
728 i -= 8; 825 i -= 8;
729# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
730 PixColors[idx] = PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
731 SET_PIXCOLOR(idx); 828 SET_PIXCOLOR (idx);
732 goto Done; 829 goto Done;
733# endif 830# endif
831
734 } 832 }
735 if (i >= 0 && i <= 7) { /* normal colors */ 833 if (i >= 0 && i <= 7)
834 { /* normal colors */
736 PixColors[idx] = PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
737 SET_PIXCOLOR(idx); 836 SET_PIXCOLOR (idx);
738 goto Done; 837 goto Done;
739 } 838 }
740 } 839 }
741 if (!rXParseAllocColor (& xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
742 return; 841 return;
743/* XStoreColor (Xdisplay, XCMAP, XColor*); */ 842 /* XStoreColor (display->display, XCMAP, XColor*); */
744 843
745/* 844 /*
746 * FIXME: should free colors here, but no idea how to do it so instead, 845 * FIXME: should free colors here, but no idea how to do it so instead,
747 * so just keep gobbling up the colormap 846 * so just keep gobbling up the colormap
748 */ 847 */
749# if 0 848# if 0
750 for (i = Color_Black; i <= Color_White; i++) 849 for (i = Color_Black; i <= Color_White; i++)
751 if (PixColors[idx] == PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
752 break; 851 break;
753 if (i > Color_White) { 852 if (i > Color_White)
853 {
754 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
755 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
756 DisplayPlanes(Xdisplay, Xscreen)); 856 DisplayPlanes (display->display, display->screen));
757 } 857 }
758# endif 858# endif
759 859
760 PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
761 SET_PIXCOLOR(idx); 861 SET_PIXCOLOR (idx);
762 862
763/* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
764/* Cursor cursor; */ 864 /* Cursor cursor; */
765 Done: 865Done:
766 if (idx == Color_bg && !(Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
767 XSetWindowBackground(Xdisplay, TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
768 PixColors[Color_bg]); 868 PixColors[Color_bg]);
769 869
770/* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
771 871
772 set_colorfgbg (); 872 set_colorfgbg ();
773 recolour_cursor (); 873 recolour_cursor ();
774/* the only reasonable way to enforce a clean update */ 874 /* the only reasonable way to enforce a clean update */
775 scr_poweron (); 875 scr_poweron ();
776} 876}
777 877
778#else 878#else
779# define set_window_color (idx,color) ((void)0) 879# define set_window_color (idx,color) ((void)0)
780#endif /* XTERM_COLOR_CHANGE */ 880#endif /* XTERM_COLOR_CHANGE */
781 881
782void 882void
783rxvt_term::recolour_cursor () 883rxvt_term::recolour_cursor ()
784{ 884{
785#if TODO 885#if TODO
786 rxvt_color xcol[2]; 886 rxvt_color xcol[2];
787 887
788 xcol[0] = PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
789 xcol[1] = PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
790 XQueryColors (Xdisplay, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
791 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
792#endif 892#endif
793} 893}
794 894
795/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
796/* 896/*
797 * find if fg/bg matches any of the normal (low-intensity) colors 897 * find if fg/bg matches any of the normal (low-intensity) colors
798 */ 898 */
799void 899void
800rxvt_term::set_colorfgbg () 900rxvt_term::set_colorfgbg ()
801{ 901{
802 unsigned int i; 902 unsigned int i;
803 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
804 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
805 905
806 env_colorfgbg = 906 env_colorfgbg =
807 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
808 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
809 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
810 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
811 if (PixColors[Color_fg] == PixColors[i]) { 911 if (PixColors[Color_fg] == PixColors[i])
912 {
812 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
813 break; 914 break;
814 } 915 }
815 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
816 if (PixColors[Color_bg] == PixColors[i]) { 917 if (PixColors[Color_bg] == PixColors[i])
918 {
817 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
818#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
819 xpmb = "default;"; 921 xpmb = "default;";
820#endif 922#endif
821 break; 923 break;
822 } 924 }
925
823 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
824 putenv(env_colorfgbg);
825 927
826#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
827 colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
828 for (i = minCOLOR; i <= maxCOLOR; i++) { 930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
829 if (PixColors[Color_fg] == PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
830 colorfgbg = SET_FGCOLOR(colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
831 if (PixColors[Color_bg] == PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
832 colorfgbg = SET_BGCOLOR(colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
833 } 936 }
834#endif 937#endif
835} 938}
836 939
837/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
… …
841 */ 944 */
842 945
843int 946int
844rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
845{ 948{
846 if (!screen_in_out->set (this, colour)) { 949 if (!screen_in_out->set (display, colour))
950 {
847 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
848 return false; 952 return false;
849 } 953 }
850 954
851 return true; 955 return true;
852} 956}
853 957
854/* -------------------------------------------------------------------- * 958/* -------------------------------------------------------------------- *
855 * - WINDOW RESIZING - * 959 * - WINDOW RESIZING - *
856 * -------------------------------------------------------------------- */ 960 * -------------------------------------------------------------------- */
… …
862#ifdef SMART_RESIZE 966#ifdef SMART_RESIZE
863 int old_width = szHint.width, old_height = szHint.height; 967 int old_width = szHint.width, old_height = szHint.height;
864#endif 968#endif
865 969
866 window_calc (width, height); 970 window_calc (width, height);
867 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint); 971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
868 if (!ignoreparent) 972 if (!ignoreparent)
869 { 973 {
870#ifdef SMART_RESIZE 974#ifdef SMART_RESIZE
871 /* 975 /*
872 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
875 int x, y, x1, y1; 979 int x, y, x1, y1;
876 int dx, dy; 980 int dx, dy;
877 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 981 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
878 Window unused_cr; 982 Window unused_cr;
879 983
880 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot, 984 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
881 0, 0, &x, &y, &unused_cr); 985 0, 0, &x, &y, &unused_cr);
882 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1, 986 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
883 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 987 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
884 /* 988 /*
885 * if Xroot isn't the parent window, a WM will probably have offset 989 * if display->root isn't the parent window, a WM will probably have offset
886 * our position for handles and decorations. Counter it 990 * our position for handles and decorations. Counter it
887 */ 991 */
888 if (x1 != x || y1 != y) { 992 if (x1 != x || y1 != y)
993 {
889 x -= x1; 994 x -= x1;
890 y -= y1; 995 y -= y1;
891 } 996 }
892 997
893 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2; 998 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
894 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2; 999 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
895 dx = old_width - szHint.width; 1000 dx = old_width - szHint.width;
896 dy = old_height - szHint.height; 1001 dy = old_height - szHint.height;
897 1002
898 /* Check position of the center of the window */ 1003 /* Check position of the center of the window */
899 if (x < x1) /* left half */ 1004 if (x < x1) /* left half */
900 dx = 0; 1005 dx = 0;
901 else if (x == x1) /* exact center */ 1006 else if (x == x1) /* exact center */
902 dx /= 2; 1007 dx /= 2;
903 if (y < y1) /* top half */ 1008 if (y < y1) /* top half */
904 dy = 0; 1009 dy = 0;
905 else if (y == y1) /* exact center */ 1010 else if (y == y1) /* exact center */
906 dy /= 2; 1011 dy /= 2;
907 1012
908 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy, 1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
909 szHint.width, szHint.height); 1014 szHint.width, szHint.height);
910#else 1015#else
911 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width, 1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
912 szHint.height); 1017 szHint.height);
913#endif 1018#endif
1019
914 } 1020 }
915 1021
916 fix_screen = (TermWin.ncol != prev_ncol 1022 fix_screen = (TermWin.ncol != prev_ncol
917 || TermWin.nrow != prev_nrow); 1023 || TermWin.nrow != prev_nrow);
918 1024
919 if (fix_screen || width != old_width || height != old_height) 1025 if (fix_screen || width != old_width || height != old_height)
920 { 1026 {
921 if (scrollbar_visible ()) 1027 if (scrollbar_visible ())
922 { 1028 {
923 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x, 1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
924 0, scrollbar_TotalWidth (), szHint.height); 1030 0, scrollbar_TotalWidth (), szHint.height);
925 resize_scrollbar (); 1031 resize_scrollbar ();
926 } 1032 }
927 1033
928 if (menubar_visible ()) 1034 if (menubar_visible ())
929 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x, 1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
930 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
931 1037
932 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
933 window_vt_y, TermWin_TotalWidth (), 1039 window_vt_y, TermWin_TotalWidth (),
934 TermWin_TotalHeight ()); 1040 TermWin_TotalHeight ());
935#ifdef RXVT_GRAPHICS 1041 scr_clear (height != old_height);
936 if (old_height)
937 Gr_Resize (old_width - szHint.base_width,
938 old_height - szHint.base_height);
939#endif
940 scr_clear ();
941#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
942 resize_pixmap (); 1043 resize_pixmap ();
943#endif 1044#endif
1045
944 } 1046 }
945 1047
946 if (fix_screen || old_height == 0) 1048 if (fix_screen || old_height == 0)
947 { 1049 {
948 int curr_screen = -1; 1050 int curr_screen = -1;
… …
955 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
956 curr_screen = scr_change_screen (PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
957 TermWin.ncol = ncol; 1059 TermWin.ncol = ncol;
958 } 1060 }
959 1061
960 scr_reset(); 1062 scr_reset ();
961 1063
962 if (curr_screen >= 0) /* this is not the first time through */ 1064 if (curr_screen >= 0) /* this is not the first time through */
963 { 1065 {
964 scr_change_screen (curr_screen); 1066 scr_change_screen (curr_screen);
965 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
979 * good for toggling 80/132 columns 1081 * good for toggling 80/132 columns
980 */ 1082 */
981void 1083void
982rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1084rxvt_term::set_widthheight (unsigned int width, unsigned int height)
983{ 1085{
984 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
985 1087
986 if (width == 0 || height == 0) { 1088 if (width == 0 || height == 0)
1089 {
987 XGetWindowAttributes(Xdisplay, Xroot, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
988 if (width == 0) 1091 if (width == 0)
989 width = wattr.width - szHint.base_width; 1092 width = wattr.width - szHint.base_width;
990 if (height == 0) 1093 if (height == 0)
991 height = wattr.height - szHint.base_height; 1094 height = wattr.height - szHint.base_height;
992 } 1095 }
993 if (width != TermWin.width || height != TermWin.height) { 1096 if (width != TermWin.width || height != TermWin.height)
1097 {
994 width += szHint.base_width; 1098 width += szHint.base_width;
995 height += szHint.base_height; 1099 height += szHint.base_height;
996 resize_all_windows (width, height, 0); 1100 resize_all_windows (width, height, 0);
997 } 1101 }
998} 1102}
999 1103
1000/* -------------------------------------------------------------------- * 1104/* -------------------------------------------------------------------- *
1001 * - X INPUT METHOD ROUTINES - * 1105 * - X INPUT METHOD ROUTINES - *
1002 * -------------------------------------------------------------------- */ 1106 * -------------------------------------------------------------------- */
1003#ifdef USE_XIM 1107#ifdef USE_XIM
1108
1004void 1109void
1005rxvt_term::set_size (XRectangle *size) 1110rxvt_term::im_set_size (XRectangle *size)
1006{ 1111{
1007 size->x = TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
1008 size->y = TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
1009 size->width = Width2Pixel(TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
1010 size->height = Height2Pixel(TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
1011} 1116}
1012 1117
1013void 1118void
1014rxvt_term::set_color (unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1015{ 1120{
1016 *fg = PixColors[Color_fg]; 1121 *fg = PixColors[Color_fg];
1017 *bg = PixColors[Color_bg]; 1122 *bg = PixColors[Color_bg];
1018} 1123}
1019 1124
1020/* Checking whether input method is running. */ 1125/* Checking whether input method is running. */
1021bool 1126bool
1022rxvt_term::IMisRunning () 1127rxvt_term::IMisRunning ()
1023{ 1128{
1024 char *p; 1129 char *p;
1025 Atom atom; 1130 Atom atom;
1026 Window win; 1131 Window win;
1027 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
1028 1133
1029/* get current locale modifier */ 1134 /* get current locale modifier */
1030 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1136 {
1031 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
1032 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1033 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1034 *p = '\0'; 1140 *p = '\0';
1035 1141
1036 atom = XInternAtom(Xdisplay, server, False); 1142 atom = XInternAtom (display->display, server, False);
1037 win = XGetSelectionOwner(Xdisplay, atom); 1143 win = XGetSelectionOwner (display->display, atom);
1038 if (win != None) 1144 if (win != None)
1039 return True; 1145 return True;
1040 } 1146 }
1041 return False; 1147 return False;
1042} 1148}
1043 1149
1044void 1150void
1045rxvt_term::IMSendSpot () 1151rxvt_term::IMSendSpot ()
1046{ 1152{
1047 XPoint spot; 1153 XPoint spot;
1048 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
1049 1155
1050 if (Input_Context == NULL 1156 if (Input_Context == NULL
1051 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1052 || !(event_type == KeyPress 1158 || ! (event_type == KeyPress
1053 || event_type == Expose 1159 || event_type == Expose
1054 || event_type == NoExpose 1160 || event_type == NoExpose
1055 || event_type == SelectionNotify 1161 || event_type == SelectionNotify
1056 || event_type == ButtonRelease || event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
1057 || !IMisRunning ()) 1163 || !IMisRunning ())
1058 return; 1164 return;
1059 1165
1060 set_position (&spot); 1166 im_set_position (&spot);
1061 1167
1062 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1063 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1064 XFree(preedit_attr); 1170 XFree (preedit_attr);
1065} 1171}
1066 1172
1067void 1173void
1068rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1069 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1070{ 1176{
1071 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1072 1178
1073 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1074 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1075 1181
1076 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1077 mbh -= TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1078 1184
1079 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1080 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1081 1187
1082 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1083 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1084 1190
1085 status_rect->x = vtx; 1191 status_rect->x = vtx;
1086 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1087 1193
1088 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1089 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1090} 1196}
1091 1197
1092/* ARGSUSED */
1093/* EXTPROTO */
1094void 1198void
1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1199rxvt_term::im_destroy ()
1096 __attribute__ ((unused)), XPointer call_data
1097 __attribute__ ((unused)))
1098{ 1200{
1201 if (Input_Context)
1202 {
1203 XDestroyIC (Input_Context);
1099 GET_R->Input_Context = NULL; 1204 Input_Context = NULL;
1100/* To avoid Segmentation Fault in C locale: Solaris only? */ 1205 }
1101 if (STRCMP (GET_R->locale, "C")) 1206
1102 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL, 1207 if (input_method)
1103 rxvt_IMInstantiateCallback, NULL); 1208 {
1209 display->put_xim (input_method);
1210 input_method = 0;
1211 }
1104} 1212}
1105 1213
1106/* 1214/*
1107 * Try to open a XIM with the current modifiers, then see if we can 1215 * Try to open a XIM with the current modifiers, then see if we can
1108 * open a suitable preedit type 1216 * open a suitable preedit type
1109 */ 1217 */
1110bool 1218bool
1111rxvt_term::IM_get_IC () 1219rxvt_term::IM_get_IC (const char *modifiers)
1112{ 1220{
1113 int i, j, found; 1221 int i, j, found;
1114 XIM xim; 1222 XIM xim;
1115 XPoint spot; 1223 XPoint spot;
1116 XRectangle rect, status_rect, needed_rect; 1224 XRectangle rect, status_rect, needed_rect;
1117 unsigned long fg, bg; 1225 unsigned long fg, bg;
1118 const char *p; 1226 const char *p;
1119 char **s; 1227 char **s;
1120 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1121 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1122 XIMCallback ximcallback;
1123 1230
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false;
1233
1124 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1125 xim = XOpenIM (Xdisplay, NULL, NULL, NULL); 1235 input_method = display->get_xim (locale, modifiers);
1126 if (xim == NULL) 1236 if (input_method == NULL)
1127 return False; 1237 return false;
1128 1238
1239 xim = input_method->xim;
1240
1129 xim_styles = NULL; 1241 xim_styles = NULL;
1130 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1131 || !xim_styles || !xim_styles->count_styles) { 1243 || !xim_styles || !xim_styles->count_styles)
1132 XCloseIM(xim); 1244 {
1245 display->put_xim (input_method);
1133 return False; 1246 return false;
1134 } 1247 }
1135 1248
1136 p = rs[Rs_preeditType] ? rs[Rs_preeditType] 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1137 : "OverTheSpot,OffTheSpot,Root";
1138 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1139 for (i = found = 0; !found && s[i]; i++) { 1251 for (i = found = 0; !found && s[i]; i++)
1252 {
1140 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1141 input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1142 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1143 input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1144 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1145 input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1146 1259
1147 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1148 if (input_style == xim_styles->supported_styles[j]) { 1261 if (input_style == xim_styles->supported_styles[j])
1262 {
1149 found = 1; 1263 found = 1;
1150 break; 1264 break;
1151 } 1265 }
1152 } 1266 }
1267
1153 for (i = 0; s[i]; i++) 1268 for (i = 0; s[i]; i++)
1154 free(s[i]); 1269 free (s[i]);
1270
1155 free(s); 1271 free (s);
1156 XFree(xim_styles); 1272 XFree (xim_styles);
1157 1273
1158 if (!found) { 1274 if (!found)
1159 XCloseIM(xim); 1275 {
1276 display->put_xim (input_method);
1160 return False; 1277 return false;
1161 } 1278 }
1162 1279
1163 ximcallback.callback = rxvt_IMDestroyCallback;
1164
1165 /* XXX: not sure why we need this (as well as IC one below) */
1166 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1167
1168 preedit_attr = status_attr = NULL; 1280 preedit_attr = status_attr = NULL;
1169 1281
1170 if (input_style & XIMPreeditPosition) { 1282 if (input_style & XIMPreeditPosition)
1283 {
1171 set_size (&rect); 1284 im_set_size (&rect);
1172 set_position (&spot); 1285 im_set_position (&spot);
1173 set_color (&fg, &bg); 1286 im_set_color (&fg, &bg);
1174 1287
1175 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1176 XNSpotLocation, &spot, 1289 XNSpotLocation, &spot,
1177 XNForeground, fg, XNBackground, bg,
1178 //XNFontSet, TermWin.fontset,
1179 NULL);
1180 } else if (input_style & XIMPreeditArea) {
1181 set_color (&fg, &bg);
1182
1183 /*
1184 * The necessary width of preedit area is unknown
1185 * until create input context.
1186 */
1187 needed_rect.width = 0;
1188
1189 set_preedit_area(&rect, &status_rect, &needed_rect);
1190
1191 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1192 XNForeground, fg, XNBackground, bg,
1193 //XNFontSet, TermWin.fontset,
1194 NULL);
1195 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1196 XNForeground, fg, XNBackground, bg, 1290 XNForeground, fg, XNBackground, bg,
1197 //XNFontSet, TermWin.fontset, 1291 //XNFontSet, TermWin.fontset,
1198 NULL); 1292 NULL);
1293 }
1294 else if (input_style & XIMPreeditArea)
1199 } 1295 {
1296 im_set_color (&fg, &bg);
1297
1298 /*
1299 * The necessary width of preedit area is unknown
1300 * until create input context.
1301 */
1302 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1305
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1307 XNForeground, fg, XNBackground, bg,
1308 //XNFontSet, TermWin.fontset,
1309 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1311 XNForeground, fg, XNBackground, bg,
1312 //XNFontSet, TermWin.fontset,
1313 NULL);
1314 }
1315
1200 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1201 XNClientWindow, TermWin.parent[0], 1317 XNClientWindow, TermWin.parent[0],
1202 XNFocusWindow, TermWin.parent[0], 1318 XNFocusWindow, TermWin.parent[0],
1203 XNDestroyCallback, &ximcallback,
1204 preedit_attr ? XNPreeditAttributes : NULL, 1319 preedit_attr ? XNPreeditAttributes : NULL,
1205 preedit_attr, 1320 preedit_attr,
1206 status_attr ? XNStatusAttributes : NULL, 1321 status_attr ? XNStatusAttributes : NULL,
1207 status_attr, NULL); 1322 status_attr, NULL);
1208 if (preedit_attr) 1323 if (preedit_attr) XFree (preedit_attr);
1209 XFree(preedit_attr); 1324 if (status_attr) XFree (status_attr);
1210 if (status_attr) 1325
1211 XFree(status_attr);
1212 if (Input_Context == NULL) { 1326 if (Input_Context == NULL)
1327 {
1213 rxvt_print_error("failed to create input context"); 1328 rxvt_print_error ("failed to create input context");
1214 XCloseIM(xim); 1329 display->put_xim (input_method);
1215 return False; 1330 return false;
1216 } 1331 }
1332
1217 if (input_style & XIMPreeditArea) 1333 if (input_style & XIMPreeditArea)
1218 IMSetStatusPosition (); 1334 IMSetStatusPosition ();
1335
1219 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1220 return True; 1337 return true;
1221} 1338}
1222 1339
1223/*
1224 * X manual pages and include files don't match on some systems:
1225 * some think this is an XIDProc and others an XIMProc so we can't
1226 * use the first argument - need to update this to be nice for
1227 * both types via some sort of configure detection
1228 */
1229/* ARGSUSED */
1230/* EXTPROTO */
1231void 1340void
1232rxvt_IMInstantiateCallback(Display * unused 1341rxvt_term::im_cb ()
1233 __attribute__ ((unused)), XPointer client_data
1234 __attribute__ ((unused)), XPointer call_data
1235 __attribute__ ((unused)))
1236{ 1342{
1237 int i, found, had_im; 1343 int i, found, had_im;
1238 const char *p; 1344 const char *p;
1239 char **s; 1345 char **s;
1240 char buf[IMBUFSIZ]; 1346 char buf[IMBUFSIZ];
1241 1347
1348 im_destroy ();
1349
1242 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1243 if (GET_R->Input_Context) 1351 if (Input_Context)
1244 return; 1352 return;
1245 1353
1246#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1247 if (GET_R->rs[Rs_imLocale]) 1355 if (rs[Rs_imLocale])
1248 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]); 1356 SET_LOCALE (rs[Rs_imLocale]);
1249#endif 1357#endif
1250 1358
1251 p = GET_R->rs[Rs_inputMethod]; 1359 p = rs[Rs_inputMethod];
1252 if (p && *p) 1360 if (p && *p)
1253 { 1361 {
1254 bool found = false; 1362 bool found = false;
1255 1363
1256 s = rxvt_splitcommastring (p); 1364 s = rxvt_splitcommastring (p);
… …
1258 { 1366 {
1259 if (*s[i]) 1367 if (*s[i])
1260 { 1368 {
1261 STRCPY (buf, "@im="); 1369 STRCPY (buf, "@im=");
1262 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1370 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1263 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ()) 1371 if (IM_get_IC (buf))
1264 { 1372 {
1265 found = true; 1373 found = true;
1266 break; 1374 break;
1267 } 1375 }
1268 } 1376 }
1269 } 1377 }
1270 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1271 free(s[i]); 1379 free (s[i]);
1272 free(s); 1380 free (s);
1273 1381
1274 if (found) 1382 if (found)
1275 goto done; 1383 goto done;
1276 } 1384 }
1277 1385
1278/* try with XMODIFIERS env. var. */ 1386 /* try with XMODIFIERS env. var. */
1279 if ((p = XSetLocaleModifiers ("")) && *p 1387 if (IM_get_IC (""))
1280 && GET_R->IM_get_IC ())
1281 goto done; 1388 goto done;
1282 1389
1283/* try with no modifiers base IF the user didn't specify an IM */ 1390 /* try with no modifiers base IF the user didn't specify an IM */
1284 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1391 if (IM_get_IC ("@im=none"))
1285 && GET_R->IM_get_IC () == True)
1286 goto done; 1392 goto done;
1287 1393
1288done: 1394done:
1289#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1290 if (GET_R->rs[Rs_imLocale]) 1396 if (rs[Rs_imLocale])
1291 setlocale (LC_CTYPE, GET_R->locale); 1397 SET_LOCALE (locale);
1292#endif 1398#endif
1293} 1399}
1294 1400
1295void 1401void
1296rxvt_term::IMSetStatusPosition () 1402rxvt_term::IMSetStatusPosition ()
1297{ 1403{
1298 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1299 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1300 1406
1301 if (Input_Context == NULL 1407 if (Input_Context == NULL
1302 || !TermWin.focus || !(input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1303 || !IMisRunning ()) 1409 || !IMisRunning ())
1304 return; 1410 return;
1305 1411
1306/* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1307 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1308 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1309 XFree(status_attr); 1415 XFree (status_attr);
1310 1416
1311 set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1312 1418
1313 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1314 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1315 1421
1316 XSetICValues(Input_Context, 1422 XSetICValues (Input_Context,
1317 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1318 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1319 1425
1320 XFree(preedit_attr); 1426 XFree (preedit_attr);
1321 XFree(status_attr); 1427 XFree (status_attr);
1322} 1428}
1323#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1324 1430
1325/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1326rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

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