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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.36 by pcg, Sat Feb 21 20:33:40 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines