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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines