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.12 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.38 by pcg, Sat Feb 21 21:43:37 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines