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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines