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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines