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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines