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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.37 by pcg, Sat Feb 21 20:35:33 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines