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.25 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.45 by pcg, Tue Feb 24 21:46:15 2004 UTC

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

Diff Legend

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