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.32 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines