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.23 by pcg, Sat Jan 31 03:18:43 2004 UTC vs.
Revision 1.41 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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