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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines