[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.108 by root, Wed Aug 25 05:03:33 2004 UTC

…		…
51	static char curlocale[128];	51	static char curlocale[128];
52		52
53	bool	53	bool
54	rxvt_set_locale (const char *locale)	54	rxvt_set_locale (const char *locale)
55	{	55	{
56	if (!locale \|\| !STRNCMP (locale, curlocale, 128))	56	if (!locale \|\| !strncmp (locale, curlocale, 128))
57	return false;	57	return false;
58		58
59	STRNCPY (curlocale, locale, 128);	59	strncpy (curlocale, locale, 128);
60	setlocale (LC_CTYPE, curlocale);	60	setlocale (LC_CTYPE, curlocale);
61	return true;	61	return true;
62	}	62	}
63		63
64	#if ENABLE_COMBINING	64	#if ENABLE_COMBINING
…		…
123	return len;	123	return len;
124		124
125	}	125	}
126	#endif	126	#endif
127		127
128	void *
129	rxvt_term::operator new (size_t s)
130	{
131	void *p = malloc (s);
132
133	MEMSET (p, 0, s);
134	return p;
135	}
136
137	void
138	rxvt_term::operator delete (void *p, size_t s)
139	{
140	free (p);
141	}
142
143	rxvt_term::rxvt_term ()	128	rxvt_term::rxvt_term ()
144	:	129	:
		130	#if TRANSPARENT
145	rootwin_ev (this, &rxvt_term::rootwin_cb),	131	rootwin_ev (this, &rxvt_term::rootwin_cb),
		132	#endif
		133	#ifdef HAVE_SCROLLBARS
		134	scrollbar_ev (this, &rxvt_term::x_cb),
		135	#endif
		136	#ifdef MENUBAR
		137	menubar_ev (this, &rxvt_term::x_cb),
		138	#endif
		139	#ifdef CURSOR_BLINK
		140	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		141	#endif
		142	#ifdef TEXT_BLINK
		143	text_blink_ev (this, &rxvt_term::text_blink_cb),
		144	#endif
		145	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		146	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		147	#endif
		148	#ifdef SELECTION_SCROLLING
		149	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		150	#endif
		151	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		152	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		153	#endif
		154	#ifdef POINTER_BLANK
		155	pointer_ev (this, &rxvt_term::pointer_cb),
		156	#endif
		157	#ifdef USE_XIM
		158	im_ev (this, &rxvt_term::im_cb),
		159	#endif
146	termwin_ev (this, &rxvt_term::x_cb),	160	termwin_ev (this, &rxvt_term::x_cb),
147	vt_ev (this, &rxvt_term::x_cb),	161	vt_ev (this, &rxvt_term::x_cb),
148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162	#endif
163	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168	#endif
169	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	check_ev (this, &rxvt_term::check_cb),	162	check_ev (this, &rxvt_term::check_cb),
176	flush_ev (this, &rxvt_term::flush_cb),	163	flush_ev (this, &rxvt_term::flush_cb),
177	destroy_ev (this, &rxvt_term::destroy_cb),	164	destroy_ev (this, &rxvt_term::destroy_cb),
178	pty_ev (this, &rxvt_term::pty_cb),	165	pty_ev (this, &rxvt_term::pty_cb),
179	incr_ev (this, &rxvt_term::incr_cb)	166	incr_ev (this, &rxvt_term::incr_cb)
…		…
185		172
186	rxvt_term::~rxvt_term ()	173	rxvt_term::~rxvt_term ()
187	{	174	{
188	termlist.erase (find (termlist.begin (), termlist.end(), this));	175	termlist.erase (find (termlist.begin (), termlist.end(), this));
189		176
190	if (cmd_fd >= 0)	177	if (cmd_pid)
191	close (cmd_fd);	178	kill (-cmd_pid, SIGHUP);
192		179
193	#ifndef NO_SETOWNER_TTYDEV	180	pty.put ();
194	privileged_ttydev (RESTORE);	181
195	#endif
196	#ifdef UTMP_SUPPORT	182	#ifdef UTMP_SUPPORT
197	privileged_utmp (RESTORE);	183	privileged_utmp (RESTORE);
198	#endif	184	#endif
199		185
		186	#if ENABLE_STYLES
		187	for (int i = RS_styleCount; --i; )
		188	if (TermWin.fontset[i] != TermWin.fontset[0])
		189	delete TermWin.fontset[i];
		190	#endif
200	delete TermWin.fontset;	191	delete TermWin.fontset[0];
201		192
202	if (display)	193	if (display)
203	{	194	{
204	selection_clear ();	195	selection_clear ();
205		196
		197	#ifdef USE_XIM
		198	im_destroy ();
		199	#endif
206	#ifdef MENUBAR	200	#ifdef MENUBAR
207	if (menubarGC) XFreeGC (display->display, menubarGC);	201	if (menubarGC) XFreeGC (display->display, menubarGC);
208	#endif	202	#endif
209	#ifdef XTERM_SCROLLBAR	203	#ifdef XTERM_SCROLLBAR
210	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	204	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
211	if (ShadowGC) XFreeGC (display->display, ShadowGC);	205	if (ShadowGC) XFreeGC (display->display, ShadowGC);
212	#endif	206	#endif
…		…
243	XDestroyWindow (display->display, TermWin.parent[0]);	237	XDestroyWindow (display->display, TermWin.parent[0]);
244	}	238	}
245		239
246	// TODO: free pixcolours, colours should become part of rxvt_display	240	// TODO: free pixcolours, colours should become part of rxvt_display
247		241
248	delete PixColorsFocused;	242	delete pix_colors_focused;
249	#ifdef OFF_FOCUS_FADING	243	#ifdef OFF_FOCUS_FADING
250	delete PixColorsUnFocused;	244	delete pix_colors_unfocused;
251	#endif	245	#endif
252		246
253	displays.put (display);	247	displays.put (display);
254		248
255	scr_release ();	249	scr_release ();
…		…
274	}	268	}
275		269
276	void	270	void
277	rxvt_term::destroy ()	271	rxvt_term::destroy ()
278	{	272	{
		273	if (destroy_ev.active)
		274	return;
		275
		276	#if ENABLE_OVERLAY
		277	scr_overlay_off ();
		278	#endif
		279
279	if (display)	280	if (display)
280	{	281	{
		282	#if USE_XIM
		283	im_ev.stop (display);
		284	#endif
		285	#if HAVE_SCROLLBARS
		286	scrollbar_ev.stop (display);
		287	#endif
		288	#if MENUBAR
		289	menubar_ev.stop (display);
		290	#endif
		291	#if TRANSPARENT
281	rootwin_ev.stop (display);	292	rootwin_ev.stop (display);
		293	#endif
		294	incr_ev.stop ();
282	termwin_ev.stop (display);	295	termwin_ev.stop (display);
283	vt_ev.stop (display);	296	vt_ev.stop (display);
284	#ifdef USE_XIM
285	im_destroy ();
286	im_ev.stop (display);
287	#endif
288	#ifdef HAVE_SCROLLBARS
289	scrollbar_ev.stop (display);
290	#endif
291	#ifdef MENUBAR
292	menubar_ev.stop (display);
293	#endif
294	}	297	}
295		298
296	check_ev.stop ();	299	check_ev.stop ();
297	pty_ev.stop ();	300	pty_ev.stop ();
298	#ifdef CURSOR_BLINK	301	#ifdef CURSOR_BLINK
…		…
330	SET_R (this);	333	SET_R (this);
331		334
332	if (!init_vars ())	335	if (!init_vars ())
333	return false;	336	return false;
334		337
		338	init_secondary ();
		339
		340	const char **cmd_argv = init_resources (argc, argv);
		341
		342	set_locale ("");
		343
		344	#if MENUBAR_MAX
		345	menubar_read (rs[Rs_menu]);
		346	#endif
		347	#ifdef HAVE_SCROLLBARS
		348	if (options & Opt_scrollBar)
		349	scrollBar.setIdle (); /* set existence for size calculations */
		350	#endif
		351
		352	create_windows (argc, argv);
		353
		354	init_xlocale ();
		355
		356	scr_reset (); /* initialize screen */
		357
		358	#if 0
		359	XSynchronize (display->display, True);
		360	#endif
		361
		362	#ifdef HAVE_SCROLLBARS
		363	if (options & Opt_scrollBar)
		364	resize_scrollbar (); /* create and map scrollbar */
		365	#endif
		366	#if (MENUBAR_MAX)
		367	if (menubar_visible ())
		368	XMapWindow (display->display, menuBar.win);
		369	#endif
		370	#ifdef TRANSPARENT
		371	if (options & Opt_transparent)
		372	{
		373	XSelectInput (display->display, display->root, PropertyChangeMask);
		374	check_our_parents ();
		375	rootwin_ev.start (display, display->root);
		376	}
		377	#endif
		378
		379	XMapWindow (display->display, TermWin.vt);
		380	XMapWindow (display->display, TermWin.parent[0]);
		381
		382	set_colorfgbg ();
		383
		384	init_command (cmd_argv);
		385
		386	pty_ev.start (pty.pty, EVENT_READ);
		387
		388	check_ev.start ();
		389
		390	return true;
		391	}
		392
		393	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
		394
		395	void
		396	rxvt_init ()
		397	{
		398	/* install exit handler for cleanup */
		399	#if 0
		400	#ifdef HAVE_ATEXIT
		401	atexit (rxvt_clean_exit);
		402	#else
		403	#endif
		404	#endif
335	/*	405	/*
336	* Save and then give up any super-user privileges	406	* Save and then give up any super-user privileges
337	* If we need privileges in any area then we must specifically request it.	407	* If we need privileges in any area then we must specifically request it.
338	* We should only need to be root in these cases:	408	* We should only need to be root in these cases:
339	* 1. write utmp entries on some systems	409	* 1. write utmp entries on some systems
340	* 2. chown tty on some systems	410	* 2. chown tty on some systems
341	*/	411	*/
342	privileges (SAVE);	412	rxvt_privileges (SAVE);
343	privileges (IGNORE);	413	rxvt_privileges (IGNORE);
344
345	init_secondary ();
346
347	const char **cmd_argv = init_resources (argc, argv);
348
349	set_locale ("");
350
351	#if MENUBAR_MAX
352	menubar_read (rs[Rs_menu]);
353	#endif
354	#ifdef HAVE_SCROLLBARS
355	if (Options & Opt_scrollBar)
356	scrollBar.setIdle (); /* set existence for size calculations */
357	#endif
358
359	create_windows (argc, argv);
360
361	init_xlocale ();
362
363	scr_reset (); /* initialize screen */
364
365	#if 0
366	XSynchronize (display->display, True);
367	#endif
368
369	#ifdef HAVE_SCROLLBARS
370	if (Options & Opt_scrollBar)
371	resize_scrollbar (); /* create and map scrollbar */
372	#endif
373	#if (MENUBAR_MAX)
374	if (menubar_visible ())
375	XMapWindow (display->display, menuBar.win);
376	#endif
377	#ifdef TRANSPARENT
378	if (Options & Opt_transparent)
379	{
380	XSelectInput (display->display, display->root, PropertyChangeMask);
381	check_our_parents ();
382	}
383	#endif
384
385	rootwin_ev.start (display, display->root);
386
387	XMapWindow (display->display, TermWin.vt);
388	XMapWindow (display->display, TermWin.parent[0]);
389
390	init_command (cmd_argv);
391
392	pty_ev.start (cmd_fd, EVENT_READ);
393
394	check_ev.start ();
395
396	return true;
397	}
398
399	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
400
401	void
402	rxvt_init_signals ()
403	{
404	/* install exit handler for cleanup */
405	#if 0
406	#ifdef HAVE_ATEXIT
407	atexit (rxvt_clean_exit);
408	#else
409	#endif
410	#endif
411		414
412	struct sigaction sa;	415	struct sigaction sa;
413		416
414	sigfillset (&sa.sa_mask);	417	sigfillset (&sa.sa_mask);
415	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;	418	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;
…		…
443	break;	446	break;
444	}	447	}
445	}	448	}
446		449
447	/* ARGSUSED */	450	/* ARGSUSED */
448	/* EXTPROTO */	451	/* INTPROTO */
449	RETSIGTYPE	452	RETSIGTYPE
450	rxvt_Child_signal (int sig __attribute__ ((unused)))	453	rxvt_Child_signal (int sig __attribute__ ((unused)))
451	{	454	{
452	int pid, save_errno = errno;	455	int pid, save_errno = errno;
453		456
…		…
458	}	461	}
459		462
460	/*	463	/*
461	* Catch a fatal signal and tidy up before quitting	464	* Catch a fatal signal and tidy up before quitting
462	*/	465	*/
463	/* EXTPROTO */	466	/* INTPROTO */
464	RETSIGTYPE	467	RETSIGTYPE
465	rxvt_Exit_signal (int sig)	468	rxvt_Exit_signal (int sig)
466	{	469	{
467	signal (sig, SIG_DFL);	470	signal (sig, SIG_DFL);
468	#ifdef DEBUG_CMD	471	#ifdef DEBUG_CMD
…		…
490	/----------------------------------------------------------------------/	493	/----------------------------------------------------------------------/
491	/*	494	/*
492	* Exit gracefully, clearing the utmp entry and restoring tty attributes	495	* Exit gracefully, clearing the utmp entry and restoring tty attributes
493	* TODO: if debugging, this should free up any known resources if we can	496	* TODO: if debugging, this should free up any known resources if we can
494	*/	497	*/
495	/* EXTPROTO */	498	/* INTPROTO */
496	void	499	void
497	rxvt_clean_exit ()	500	rxvt_clean_exit ()
498	{	501	{
499	// TODO: rxvtd should clean up all ressources	502	// TODO: rxvtd should clean up all ressources
500	if (GET_R)	503	if (GET_R)
…		…
502	}	505	}
503		506
504	/* ------------------------------------------------------------------------- *	507	/* ------------------------------------------------------------------------- *
505	* MEMORY ALLOCATION WRAPPERS *	508	* MEMORY ALLOCATION WRAPPERS *
506	* ------------------------------------------------------------------------- */	509	* ------------------------------------------------------------------------- */
507	/* EXTPROTO */	510	/* INTPROTO */
508	void *	511	void *
509	rxvt_malloc (size_t size)	512	rxvt_malloc (size_t size)
510	{	513	{
511	void *p;	514	void *p;
512		515
513	p = malloc (size);	516	p = malloc (size);
514	if (p)	517	if (p)
515	return p;	518	return p;
516		519
517	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	520	rxvt_fatal ("memory allocation failure. aborting.\n");
518	rxvt_clean_exit ();
519	exit (EXIT_FAILURE);
520	/* NOTREACHED */	521	/* NOTREACHED */
521	}	522	}
522		523
523	/* EXTPROTO */	524	/* INTPROTO */
524	void *	525	void *
525	rxvt_calloc (size_t number, size_t size)	526	rxvt_calloc (size_t number, size_t size)
526	{	527	{
527	void *p;	528	void *p;
528		529
529	p = calloc (number, size);	530	p = calloc (number, size);
530	if (p)	531	if (p)
531	return p;	532	return p;
532		533
533	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	534	rxvt_fatal ("memory allocation failure. aborting.\n");
534	rxvt_clean_exit ();
535	exit (EXIT_FAILURE);
536	/* NOTREACHED */	535	/* NOTREACHED */
537	}	536	}
538		537
539	/* EXTPROTO */	538	/* INTPROTO */
540	void *	539	void *
541	rxvt_realloc (void *ptr, size_t size)	540	rxvt_realloc (void *ptr, size_t size)
542	{	541	{
543	void *p;	542	void *p;
544		543
545	if (ptr)	544	if (ptr)
546	p = realloc (ptr, size);	545	p = realloc (ptr, size);
547	else	546	else
548	p = malloc (size);	547	p = malloc (size);
		548
549	if (p)	549	if (p)
550	return p;	550	return p;
551		551
552	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	552	rxvt_fatal ("memory allocation failure. aborting.\n");
553	rxvt_clean_exit ();
554	exit (EXIT_FAILURE);
555	/* NOTREACHED */	553	/* NOTREACHED */
556	}	554	}
557		555
558	/* ------------------------------------------------------------------------- *	556	/* ------------------------------------------------------------------------- *
559	* PRIVILEGED OPERATIONS *	557	* PRIVILEGED OPERATIONS *
560	* ------------------------------------------------------------------------- */	558	* ------------------------------------------------------------------------- */
561	/* take care of suid/sgid super-user (root) privileges */	559	/* take care of suid/sgid super-user (root) privileges */
562	void	560	void
563	rxvt_term::privileges (int mode)	561	rxvt_privileges (rxvt_privaction action)
564	{	562	{
		563	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		564	static uid_t euid;
		565	static gid_t egid;
		566	#endif
		567
565	#if ! defined(__CYGWIN32__)	568	#if ! defined(__CYGWIN32__)
566	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	569	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
567	/* setreuid () is the poor man's setuid (), seteuid () */	570	/* setreuid () is the poor man's setuid (), seteuid () */
568	# define seteuid(a) setreuid(-1, (a))	571	# define seteuid(a) setreuid(-1, (a))
569	# define setegid(a) setregid(-1, (a))	572	# define setegid(a) setregid(-1, (a))
570	# define HAVE_SETEUID	573	# define HAVE_SETEUID
571	# endif	574	# endif
572	# ifdef HAVE_SETEUID	575	# ifdef HAVE_SETEUID
573	switch (mode)	576	switch (action)
574	{	577	{
575	case IGNORE:	578	case IGNORE:
576	/*	579	/*
577	* change effective uid/gid - not real uid/gid - so we can switch	580	* change effective uid/gid - not real uid/gid - so we can switch
578	* back to root later, as required	581	* back to root later, as required
…		…
588	seteuid (euid);	591	seteuid (euid);
589	setegid (egid);	592	setegid (egid);
590	break;	593	break;
591	}	594	}
592	# else	595	# else
593	switch (mode)	596	switch (action)
594	{	597	{
595	case IGNORE:	598	case IGNORE:
596	setuid (getuid ());	599	setuid (getuid ());
597	setgid (getgid ());	600	setgid (getgid ());
598	/* FALLTHROUGH */	601	/* FALLTHROUGH */
…		…
605	#endif	608	#endif
606	}	609	}
607		610
608	#ifdef UTMP_SUPPORT	611	#ifdef UTMP_SUPPORT
609	void	612	void
610	rxvt_term::privileged_utmp (char action)	613	rxvt_term::privileged_utmp (rxvt_privaction action)
611	{	614	{
612	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
613	action, next_utmp_action, getpid ()));
614	if (next_utmp_action != action \|\| (action != SAVE && action != RESTORE)
615	\|\| (Options & Opt_utmpInhibit)	615	if ((options & Opt_utmpInhibit)
616	\|\| ttydev == NULL \|\| *ttydev == '\0')	616	\|\| !pty.name \|\| !*pty.name)
617	return;	617	return;
618		618
619	privileges (RESTORE);	619	rxvt_privileges (RESTORE);
		620
620	if (action == SAVE)	621	if (action == SAVE)
621	{
622	next_utmp_action = RESTORE;
623	makeutent (ttydev, rs[Rs_display_name]);	622	makeutent (pty.name, rs[Rs_display_name]);
624	}
625	else	623	else
626	{ /* action == RESTORE */
627	next_utmp_action = IGNORE;
628	cleanutent ();	624	cleanutent ();
629	}	625
630	privileges (IGNORE);	626	rxvt_privileges (IGNORE);
631	}
632	#endif
633
634	#ifndef NO_SETOWNER_TTYDEV
635	void
636	rxvt_term::privileged_ttydev (char action)
637	{
638	D_MAIN ((stderr,
639	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
640	action, next_tty_action, getpid ()));
641	if (next_tty_action != action \|\| (action != SAVE && action != RESTORE)
642	\|\| ttydev == NULL \|\| *ttydev == '\0')
643	return;
644
645	privileges (RESTORE);
646
647	if (action == SAVE)
648	{
649	next_tty_action = RESTORE;
650	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
651	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
652	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
653	next_tty_action = IGNORE;
654	else
655	# endif
656
657	{
658	chown (ttydev, getuid (), ttygid); /* fail silently */
659	chmod (ttydev, ttymode);
660	# ifdef HAVE_REVOKE
661	revoke (ttydev);
662	# endif
663
664	}
665	}
666	else
667	{ /* action == RESTORE */
668	next_tty_action = IGNORE;
669	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
670	chmod (ttydev, ttyfd_stat.st_mode);
671	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
672	# else
673	chmod (ttydev,
674	(S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
675	chown (ttydev, 0, 0);
676	# endif
677
678	}
679
680	privileges (IGNORE);
681
682	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
683	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
684	action == RESTORE ? "Restoring" : (action ==
685	SAVE ? "Saving" :
686	"UNKNOWN ERROR for"), ttydev,
687	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
688	ttyfd_stat.st_gid));
689	# endif
690	}	627	}
691	#endif	628	#endif
692		629
693	/----------------------------------------------------------------------/	630	/----------------------------------------------------------------------/
694	/*	631	/*
…		…
765		702
766	if (scrollbar_visible ())	703	if (scrollbar_visible ())
767	{	704	{
768	sb_w = scrollbar_TotalWidth ();	705	sb_w = scrollbar_TotalWidth ();
769	szHint.base_width += sb_w;	706	szHint.base_width += sb_w;
770	if (!(Options & Opt_scrollBar_right))	707	if (!(options & Opt_scrollBar_right))
771	window_vt_x += sb_w;	708	window_vt_x += sb_w;
772	}	709	}
773		710
774	if (menubar_visible ())	711	if (menubar_visible ())
775	{	712	{
…		…
803	{	740	{
804	MIN_IT (TermWin.height, max_height);	741	MIN_IT (TermWin.height, max_height);
805	szHint.height = szHint.base_height + TermWin.height;	742	szHint.height = szHint.base_height + TermWin.height;
806	}	743	}
807		744
808	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	745	if (scrollbar_visible () && (options & Opt_scrollBar_right))
809	window_sb_x = szHint.width - sb_w;	746	window_sb_x = szHint.width - sb_w;
810		747
811	if (recalc_x)	748	if (recalc_x)
812	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	749	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
813	- szHint.width - 2 * TermWin.ext_bwidth);	750	- szHint.width - 2 * TermWin.ext_bwidth);
…		…
829	* Called after a window size change.	766	* Called after a window size change.
830	*/	767	*/
831	void	768	void
832	rxvt_term::tt_winch ()	769	rxvt_term::tt_winch ()
833	{	770	{
		771	if (pty.pty < 0)
		772	return;
		773
834	struct winsize ws;	774	struct winsize ws;
835
836	if (cmd_fd < 0)
837	return;
838		775
839	ws.ws_col = TermWin.ncol;	776	ws.ws_col = TermWin.ncol;
840	ws.ws_row = TermWin.nrow;	777	ws.ws_row = TermWin.nrow;
841	ws.ws_xpixel = ws.ws_ypixel = 0;	778	ws.ws_xpixel = TermWin.width;
842	#ifndef DEBUG_SIZE	779	ws.ws_ypixel = TermWin.height;
843	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	780	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
844	#else	781
845	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	782	#if 0
846	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	783	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
847	# ifdef SIGWINCH
848	else if (cmd_pid) /* force through to the command */	784	if (cmd_pid) /* force through to the command */
849	kill (cmd_pid, SIGWINCH);	785	kill (cmd_pid, SIGWINCH);
850	# endif
851	#endif	786	#endif
852	}	787	}
853		788
854	/----------------------------------------------------------------------/	789	/----------------------------------------------------------------------/
855	/* rxvt_change_font () - Switch to a new font */	790	/* set_fonts () - load and set the various fonts
856	/*	791	/*
857	* init = 1 - initialize	792	* init = 1 - initialize
858	*	793	*
859	* fontname == FONT_UP - switch to bigger font	794	* fontname == FONT_UP - switch to bigger font
860	* fontname == FONT_DN - switch to smaller font	795	* fontname == FONT_DN - switch to smaller font
861	*/	796	*/
862	bool	797	bool
863	rxvt_term::change_font (const char *fontname)	798	rxvt_term::set_fonts ()
864	{	799	{
865	if (fontname == FONT_UP)
866	{
867	// TODO
868	}
869	else if (fontname == FONT_DN)
870	{
871	// TODO
872	}
873	else
874	{
875	rxvt_fontset *fs = new rxvt_fontset (this);	800	rxvt_fontset *fs = new rxvt_fontset (this);
		801	rxvt_fontprop prop;
876		802
877	if (fs && fs->populate (fontname ? fontname : "fixed"))	803	prop.width = prop.height = prop.weight = prop.slant
		804	= rxvt_fontprop::unset;
		805
		806	if (!fs
		807	\|\| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop)
		808	\|\| !fs->realize_font (1))
		809	{
		810	delete fs;
		811	return false;
		812	}
		813
		814	#if ENABLE_STYLES
		815	for (int i = RS_styleCount; --i; )
		816	if (TermWin.fontset[i] != TermWin.fontset[0])
		817	delete TermWin.fontset[i];
		818	#endif
		819
		820	delete TermWin.fontset[0];
		821	TermWin.fontset[0] = fs;
		822
		823	fs->prop = prop = (*fs)[1]->properties ();
		824
		825	TermWin.fwidth = prop.width;
		826	TermWin.fheight = prop.height;
		827	TermWin.fweight = prop.weight;
		828	TermWin.fslant = prop.slant;
		829	TermWin.fbase = (*fs)[1]->ascent;
		830
		831	for (int style = 1; style < 4; style++)
		832	{
		833	#if ENABLE_STYLES
		834	const char *res = rs[Rs_font + style];
		835
		836	if (res && !*res)
		837	TermWin.fontset[style] = TermWin.fontset[0];
		838	else
878	{	839	{
879	delete TermWin.fontset;	840	TermWin.fontset[style] = fs = new rxvt_fontset (this);
880	TermWin.fontset = fs;	841	rxvt_fontprop prop2 = prop;
881	TermWin.fwidth = fs->base_font ()->width;
882	TermWin.fheight = fs->base_font ()->height;
883	TermWin.fbase = fs->base_font ()->ascent;
884		842
885	if (TermWin.parent[0])	843	if (res)
		844	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		845	else
886	{	846	{
887	resize_all_windows (0, 0, 0);	847	res = TermWin.fontset[0]->fontdesc;
888	scr_remap_chars ();	848
889	scr_touch (true);	849	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		850	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890	}	851	}
891		852
892	for (unicode_t ch = 0x20; ch <= 0x7f; ch++)	853	fs->populate (res, prop2);
893	TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
894
895	return true;
896	}	854	}
		855	#else
		856	TermWin.fontset[style] = TermWin.fontset[0];
		857	#endif
		858	}
		859
		860	if (TermWin.parent[0])
897	}	861	{
		862	resize_all_windows (0, 0, 0);
		863	scr_remap_chars ();
		864	scr_touch (true);
		865	}
898		866
899	return false;	867	return true;
900	}
901
902	bool
903	rxvt_term::font_up_down (int n, int direction)
904	{
905	return false;
906	}	868	}
907		869
908	/----------------------------------------------------------------------/	870	/----------------------------------------------------------------------/
909	/----------------------------------------------------------------------/	871	/----------------------------------------------------------------------/
910	/* xterm sequences - title, iconName, color (exptl) */	872	/* xterm sequences - title, iconName, color (exptl) */
…		…
915	char *name;	877	char *name;
916		878
917	if (!XFetchName (display->display, TermWin.parent[0], &name))	879	if (!XFetchName (display->display, TermWin.parent[0], &name))
918	name = NULL;	880	name = NULL;
919		881
920	if (name == NULL \|\| STRCMP (name, str))	882	if (name == NULL \|\| strcmp (name, str))
921	#endif	883	#endif
922	XStoreName (display->display, TermWin.parent[0], str);	884	XStoreName (display->display, TermWin.parent[0], str);
923		885
924	#ifdef SMART_WINDOW_TITLE	886	#ifdef SMART_WINDOW_TITLE
925	if (name)	887	if (name)
…		…
934	char *name;	896	char *name;
935		897
936	if (!XGetIconName (display->display, TermWin.parent[0], &name))	898	if (!XGetIconName (display->display, TermWin.parent[0], &name))
937	name = NULL;	899	name = NULL;
938		900
939	if (name == NULL \|\| STRCMP (name, str))	901	if (name == NULL \|\| strcmp (name, str))
940	#endif	902	#endif
941	XSetIconName (display->display, TermWin.parent[0], str);	903	XSetIconName (display->display, TermWin.parent[0], str);
942		904
943	#ifdef SMART_WINDOW_TITLE	905	#ifdef SMART_WINDOW_TITLE
944	if (name)	906	if (name)
…		…
962	i = atoi (color);	924	i = atoi (color);
963	if (i >= 8 && i <= 15)	925	if (i >= 8 && i <= 15)
964	{ /* bright colors */	926	{ /* bright colors */
965	i -= 8;	927	i -= 8;
966	# ifndef NO_BRIGHTCOLOR	928	# ifndef NO_BRIGHTCOLOR
967	PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];	929	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
968	SET_PIXCOLOR (idx);	930	SET_PIXCOLOR (idx);
969	goto Done;	931	goto Done;
970	# endif	932	# endif
971		933
972	}	934	}
973	if (i >= 0 && i <= 7)	935	if (i >= 0 && i <= 7)
974	{ /* normal colors */	936	{ /* normal colors */
975	PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];	937	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976	SET_PIXCOLOR (idx);	938	SET_PIXCOLOR (idx);
977	goto Done;	939	goto Done;
978	}	940	}
979	}	941	}
980		942
…		…
987	* FIXME: should free colors here, but no idea how to do it so instead,	949	* FIXME: should free colors here, but no idea how to do it so instead,
988	* so just keep gobbling up the colormap	950	* so just keep gobbling up the colormap
989	*/	951	*/
990	# if 0	952	# if 0
991	for (i = Color_Black; i <= Color_White; i++)	953	for (i = Color_Black; i <= Color_White; i++)
992	if (PixColors[idx] == PixColors[i])	954	if (pix_colors[idx] == pix_colors[i])
993	break;	955	break;
994	if (i > Color_White)	956	if (i > Color_White)
995	{	957	{
996	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	958	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
997	XFreeColors (display->display, display->cmap, (PixColors + idx), 1,	959	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
998	DisplayPlanes (display->display, display->screen));	960	DisplayPlanes (display->display, display->screen));
999	}	961	}
1000	# endif	962	# endif
1001		963
1002	PixColorsFocused[idx] = xcol;	964	pix_colors_focused[idx] = xcol;
1003	SET_PIXCOLOR (idx);	965	SET_PIXCOLOR (idx);
1004		966
1005	/* XSetWindowAttributes attr; */	967	/* XSetWindowAttributes attr; */
1006	/* Cursor cursor; */	968	/* Cursor cursor; */
1007	Done:	969	Done:
1008	#ifdef OFF_FOCUS_FADING	970	#ifdef OFF_FOCUS_FADING
		971	if (rs[Rs_fade])
1009	PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));	972	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1010	#endif	973	#endif
1011	if (idx == Color_bg && ! (Options & Opt_transparent))
1012	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1013		974
1014	/* handle Color_BD, scrollbar background, etc. */	975	/TODO: handle Color_BD, scrollbar background, etc. /
1015		976
1016	set_colorfgbg ();
1017	recolour_cursor ();	977	recolour_cursor ();
1018	scr_touch (true);	978	scr_recolour ();
1019	}	979	}
1020		980
1021	#else	981	#else
1022	# define set_window_color (idx,color) ((void)0)	982	# define set_window_color (idx,color) ((void)0)
1023	#endif /* XTERM_COLOR_CHANGE */	983	#endif /* XTERM_COLOR_CHANGE */
…		…
1025	void	985	void
1026	rxvt_term::recolour_cursor ()	986	rxvt_term::recolour_cursor ()
1027	{	987	{
1028	XColor xcol[2];	988	XColor xcol[2];
1029		989
1030	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];	990	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1031	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];	991	? pix_colors_focused[Color_pointer_fg]
		992	: pix_colors_focused[Color_fg];
		993	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		994	? pix_colors_focused[Color_pointer_bg]
		995	: pix_colors_focused[Color_bg];
		996
1032	XQueryColors (display->display, display->cmap, xcol, 2);	997	XQueryColors (display->display, display->cmap, xcol, 2);
1033	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	998	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1034	}	999	}
1035		1000
1036	/----------------------------------------------------------------------/	1001	/----------------------------------------------------------------------/
…		…
1038	* find if fg/bg matches any of the normal (low-intensity) colors	1003	* find if fg/bg matches any of the normal (low-intensity) colors
1039	*/	1004	*/
1040	void	1005	void
1041	rxvt_term::set_colorfgbg ()	1006	rxvt_term::set_colorfgbg ()
1042	{	1007	{
1043	unsigned int i;	1008	unsigned int i;
1044	const char *xpmb = "\0";	1009	const char *xpmb = "\0";
1045	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1010	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1046		1011
1047	env_colorfgbg =
1048	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	1012	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1049	STRCPY (fstr, "default");	1013	strcpy (fstr, "default");
1050	STRCPY (bstr, "default");	1014	strcpy (bstr, "default");
1051	for (i = Color_Black; i <= Color_White; i++)	1015	for (i = Color_Black; i <= Color_White; i++)
1052	if (PixColors[Color_fg] == PixColors[i])	1016	if (pix_colors[Color_fg] == pix_colors[i])
1053	{	1017	{
1054	sprintf (fstr, "%d", (i - Color_Black));	1018	sprintf (fstr, "%d", (i - Color_Black));
1055	break;	1019	break;
1056	}	1020	}
		1021
1057	for (i = Color_Black; i <= Color_White; i++)	1022	for (i = Color_Black; i <= Color_White; i++)
1058	if (PixColors[Color_bg] == PixColors[i])	1023	if (pix_colors[Color_bg] == pix_colors[i])
1059	{	1024	{
1060	sprintf (bstr, "%d", (i - Color_Black));	1025	sprintf (bstr, "%d", (i - Color_Black));
1061	#ifdef XPM_BACKGROUND	1026	#ifdef XPM_BACKGROUND
1062	xpmb = "default;";	1027	xpmb = "default;";
1063	#endif	1028	#endif
1064	break;	1029	break;
1065	}	1030	}
1066		1031
1067	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1032	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1068
1069	#ifndef NO_BRIGHTCOLOR
1070	colorfgbg = DEFAULT_RSTYLE;
1071	for (i = minCOLOR; i <= maxCOLOR; i++)
1072	{
1073	if (PixColors[Color_fg] == PixColors[i])
1074	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1075	if (PixColors[Color_bg] == PixColors[i])
1076	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1077	}
1078	#endif
1079	}	1033	}
1080		1034
1081	/----------------------------------------------------------------------/	1035	/----------------------------------------------------------------------/
1082	/*	1036	/*
1083	* Colour determination for low colour displays, routine from	1037	* Colour determination for low colour displays, routine from
…		…
1231	if (width == 0)	1185	if (width == 0)
1232	width = wattr.width - szHint.base_width;	1186	width = wattr.width - szHint.base_width;
1233	if (height == 0)	1187	if (height == 0)
1234	height = wattr.height - szHint.base_height;	1188	height = wattr.height - szHint.base_height;
1235	}	1189	}
		1190
1236	if (width != TermWin.width \|\| height != TermWin.height)	1191	if (width != TermWin.width \|\| height != TermWin.height)
1237	{	1192	{
1238	width += szHint.base_width;	1193	width += szHint.base_width;
1239	height += szHint.base_height;	1194	height += szHint.base_height;
1240	resize_all_windows (width, height, 0);	1195	resize_all_windows (width, height, 0);
…		…
1245	* - X INPUT METHOD ROUTINES - *	1200	* - X INPUT METHOD ROUTINES - *
1246	* -------------------------------------------------------------------- */	1201	* -------------------------------------------------------------------- */
1247	#ifdef USE_XIM	1202	#ifdef USE_XIM
1248		1203
1249	void	1204	void
		1205	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1206	{
		1207	fg = pix_colors[Color_fg];
		1208	bg = pix_colors[Color_bg];
		1209	}
		1210
		1211	void
1250	rxvt_term::im_set_size (XRectangle *size)	1212	rxvt_term::im_set_size (XRectangle &size)
1251	{	1213	{
		1214	// the int_bwidth terms make no sense to me
1252	size->x = TermWin.int_bwidth;	1215	size.x = TermWin.int_bwidth;
1253	size->y = TermWin.int_bwidth;	1216	size.y = TermWin.int_bwidth;
1254	size->width = Width2Pixel (TermWin.ncol);	1217	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1255	size->height = Height2Pixel (TermWin.nrow);	1218	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1256	}	1219	}
1257		1220
1258	void	1221	void
1259	rxvt_term::im_set_color (unsigned long fg, unsigned long bg)	1222	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1223	XRectangle &status_rect,
		1224	const XRectangle &needed_rect)
1260	{	1225	{
1261	*fg = PixColors[Color_fg];	1226	preedit_rect.x = needed_rect.width;
1262	*bg = PixColors[Color_bg];	1227	preedit_rect.y = 0;
		1228	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
		1229	preedit_rect.height = TermWin.fheight;
		1230
		1231	status_rect.x = 0;
		1232	status_rect.y = 0;
		1233	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
		1234	status_rect.height = TermWin.fheight;
1263	}	1235	}
1264		1236
1265	/* Checking whether input method is running. */	1237	/* Checking whether input method is running. */
1266	bool	1238	bool
1267	rxvt_term::IMisRunning ()	1239	rxvt_term::IMisRunning ()
1268	{	1240	{
1269	char *p;	1241	char *p;
1270	Atom atom;	1242	Atom atom;
1271	Window win;	1243	Window win;
1272	char server[IMBUFSIZ];	1244	char server[IMBUFSIZ];
1273		1245
1274	/* get current locale modifier */	1246	/* get current locale modifier */
1275	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1247	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1276	{	1248	{
1277	STRCPY (server, "@server=");	1249	strcpy (server, "@server=");
1278	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1250	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1251
1279	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1252	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1280	*p = '\0';	1253	*p = '\0';
1281		1254
1282	atom = XInternAtom (display->display, server, False);	1255	atom = XInternAtom (display->display, server, False);
1283	win = XGetSelectionOwner (display->display, atom);	1256	win = XGetSelectionOwner (display->display, atom);
		1257
1284	if (win != None)	1258	if (win != None)
1285	return True;	1259	return True;
1286	}	1260	}
		1261
1287	return False;	1262	return False;
1288	}	1263	}
1289		1264
1290	void	1265	void
1291	rxvt_term::IMSendSpot ()	1266	rxvt_term::IMSendSpot ()
1292	{	1267	{
1293	XPoint spot;	1268	XPoint spot;
1294	XVaNestedList preedit_attr;	1269	XVaNestedList preedit_attr;
1295		1270
1296	if (Input_Context == NULL	1271	if (!Input_Context
		1272	\|\| !TermWin.focus
1297	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditPosition)	1273	\|\| !(input_style & XIMPreeditPosition)
		1274	#if 0
1298	\|\| ! (event_type == KeyPress	1275	\|\| !(event_type == KeyPress
1299	\|\| event_type == Expose	1276	\|\| event_type == Expose
1300	\|\| event_type == NoExpose	1277	\|\| event_type == NoExpose
1301	\|\| event_type == SelectionNotify	1278	\|\| event_type == SelectionNotify
1302	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)	1279	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)
		1280	#endif
1303	\|\| !IMisRunning ())	1281	\|\| !IMisRunning ())
1304	return;	1282	return;
1305		1283
1306	im_set_position (&spot);	1284	im_set_position (spot);
1307		1285
1308	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1286	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1309	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1287	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1310	XFree (preedit_attr);	1288	XFree (preedit_attr);
1311	}	1289	}
1312		1290
1313	void	1291	void
1314	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1315	XRectangle * needed_rect)
1316	{
1317	int mbh, vtx = 0;
1318
1319	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1320	vtx = scrollbar_TotalWidth ();
1321
1322	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1323	mbh -= TermWin.lineSpace;
1324
1325	preedit_rect->x = needed_rect->width + vtx;
1326	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1327
1328	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1329	preedit_rect->height = Height2Pixel (1);
1330
1331	status_rect->x = vtx;
1332	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1333
1334	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1335	status_rect->height = Height2Pixel (1);
1336	}
1337
1338	void
1339	rxvt_term::im_destroy ()	1292	rxvt_term::im_destroy ()
1340	{	1293	{
1341	if (Input_Context)	1294	if (Input_Context)
1342	{	1295	{
1343	XDestroyIC (Input_Context);	1296	XDestroyIC (Input_Context);
1344	Input_Context = NULL;	1297	Input_Context = 0;
1345	}	1298	}
1346		1299
1347	if (input_method)	1300	if (input_method)
1348	{	1301	{
1349	display->put_xim (input_method);	1302	display->put_xim (input_method);
…		…
1356	* open a suitable preedit type	1309	* open a suitable preedit type
1357	*/	1310	*/
1358	bool	1311	bool
1359	rxvt_term::IM_get_IC (const char *modifiers)	1312	rxvt_term::IM_get_IC (const char *modifiers)
1360	{	1313	{
1361	int i, j, found;	1314	int i, j, found;
1362	XIM xim;	1315	XIM xim;
1363	XPoint spot;	1316	XPoint spot;
1364	XRectangle rect, status_rect, needed_rect;	1317	XRectangle rect, status_rect, needed_rect;
1365	unsigned long fg, bg;	1318	unsigned long fg, bg;
1366	const char *p;	1319	const char *p;
1367	char **s;	1320	char **s;
1368	XIMStyles *xim_styles;	1321	XIMStyles *xim_styles;
1369	XVaNestedList preedit_attr, status_attr;
1370		1322
1371	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1323	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1372	return false;	1324	return false;
1373		1325
1374	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1326	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1380		1332
1381	xim_styles = NULL;	1333	xim_styles = NULL;
1382	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1334	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1383	\|\| !xim_styles \|\| !xim_styles->count_styles)	1335	\|\| !xim_styles \|\| !xim_styles->count_styles)
1384	{	1336	{
1385	display->put_xim (input_method);	1337	im_destroy ();
1386	return false;	1338	return false;
1387	}	1339	}
1388		1340
1389	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1341	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1390	s = rxvt_splitcommastring (p);	1342	s = rxvt_splitcommastring (p);
		1343
1391	for (i = found = 0; !found && s[i]; i++)	1344	for (i = found = 0; !found && s[i]; i++)
1392	{	1345	{
1393	if (!STRCMP (s[i], "OverTheSpot"))	1346	if (!strcmp (s[i], "OverTheSpot"))
1394	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1347	input_style = (XIMPreeditPosition \| XIMStatusNothing);
1395	else if (!STRCMP (s[i], "OffTheSpot"))	1348	else if (!strcmp (s[i], "OffTheSpot"))
1396	input_style = (XIMPreeditArea \| XIMStatusArea);	1349	input_style = (XIMPreeditArea \| XIMStatusArea);
1397	else if (!STRCMP (s[i], "Root"))	1350	else if (!strcmp (s[i], "Root"))
1398	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1351	input_style = (XIMPreeditNothing \| XIMStatusNothing);
1399		1352
1400	for (j = 0; j < xim_styles->count_styles; j++)	1353	for (j = 0; j < xim_styles->count_styles; j++)
1401	if (input_style == xim_styles->supported_styles[j])	1354	if (input_style == xim_styles->supported_styles[j])
1402	{	1355	{
…		…
1411	free (s);	1364	free (s);
1412	XFree (xim_styles);	1365	XFree (xim_styles);
1413		1366
1414	if (!found)	1367	if (!found)
1415	{	1368	{
1416	display->put_xim (input_method);	1369	im_destroy ();
1417	return false;	1370	return false;
1418	}	1371	}
1419		1372
1420	preedit_attr = status_attr = NULL;	1373	XFontSet fs = 0;
		1374	XVaNestedList preedit_attr = 0, status_attr = 0;
		1375
		1376	if (input_style & (XIMPreeditPosition \| XIMPreeditArea))
		1377	{
		1378	// fake us a font-set, please
		1379	char **missing_charset_list;
		1380	int missing_charset_count;
		1381	char *def_string;
		1382	char pat[512];
		1383
		1384	sprintf (pat,
		1385	"----R---%d------*,"
		1386	"----R---%d------*,"
		1387	"----R---%d------*,"
		1388	"----R---%d------*,"
		1389	"----R---%d------*,"
		1390	"*",
		1391	TermWin.fheight,
		1392	TermWin.fheight + 1, TermWin.fheight - 1,
		1393	TermWin.fheight - 2, TermWin.fheight + 2);
		1394
		1395	fs = XCreateFontSet (display->display, pat,
		1396	&missing_charset_list, &missing_charset_count, &def_string);
		1397
		1398	if (missing_charset_list)
		1399	XFreeStringList (missing_charset_list);
		1400
		1401	if (!fs)
		1402	{
		1403	input_style &= ~(XIMPreeditPosition \| XIMPreeditArea);
		1404	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1405	}
		1406	}
1421		1407
1422	if (input_style & XIMPreeditPosition)	1408	if (input_style & XIMPreeditPosition)
1423	{	1409	{
1424	im_set_size (&rect);	1410	im_set_size (rect);
1425	im_set_position (&spot);	1411	im_set_position (spot);
1426	im_set_color (&fg, &bg);	1412	im_set_color (fg, bg);
1427		1413
1428	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1414	preedit_attr = XVaCreateNestedList (0,
		1415	XNForeground, fg,
		1416	XNBackground, bg,
		1417	XNArea, &rect,
1429	XNSpotLocation, &spot,	1418	XNSpotLocation, &spot,
1430	XNForeground, fg, XNBackground, bg,
1431	//XNFontSet, TermWin.fontset,	1419	XNFontSet, fs,
1432	NULL);	1420	NULL);
1433	}	1421	}
1434	else if (input_style & XIMPreeditArea)	1422	else if (input_style & XIMPreeditArea)
1435	{	1423	{
1436	im_set_color (&fg, &bg);	1424	im_set_color (fg, bg);
1437		1425
1438	/*	1426	/*
1439	* The necessary width of preedit area is unknown	1427	* The necessary width of preedit area is unknown
1440	* until create input context.	1428	* until create input context.
1441	*/	1429	*/
1442	needed_rect.width = 0;	1430	needed_rect.width = 0;
1443
1444	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1431	im_set_preedit_area (rect, status_rect, needed_rect);
1445		1432
1446	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1433	preedit_attr = XVaCreateNestedList (0,
		1434	XNForeground, fg,
1447	XNForeground, fg, XNBackground, bg,	1435	XNBackground, bg,
		1436	XNArea, &rect,
		1437	XNFontSet, fs,
		1438	NULL);
		1439	status_attr = XVaCreateNestedList (0,
		1440	XNForeground, fg,
		1441	XNBackground, bg,
		1442	XNArea, &status_rect,
1448	//XNFontSet, TermWin.fontset,	1443	XNFontSet, fs,
1449	NULL);	1444	NULL);
1450	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1451	XNForeground, fg, XNBackground, bg,
1452	//XNFontSet, TermWin.fontset,
1453	NULL);
1454	}	1445	}
1455		1446
1456	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1447	Input_Context = XCreateIC (xim,
		1448	XNInputStyle, input_style,
1457	XNClientWindow, TermWin.parent[0],	1449	XNClientWindow, TermWin.vt,
1458	XNFocusWindow, TermWin.parent[0],	1450	XNFocusWindow, TermWin.parent[0],
1459	preedit_attr ? XNPreeditAttributes : NULL,	1451	preedit_attr ? XNPreeditAttributes : NULL,
1460	preedit_attr,	1452	preedit_attr,
1461	status_attr ? XNStatusAttributes : NULL,	1453	status_attr ? XNStatusAttributes : NULL,
1462	status_attr, NULL);	1454	status_attr, NULL);
		1455
1463	if (preedit_attr) XFree (preedit_attr);	1456	if (preedit_attr) XFree (preedit_attr);
1464	if (status_attr) XFree (status_attr);	1457	if (status_attr) XFree (status_attr);
		1458	if (fs) XFreeFontSet (display->display, fs);
1465		1459
1466	if (Input_Context == NULL)	1460	if (Input_Context == NULL)
1467	{	1461	{
1468	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1462	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1469	display->put_xim (input_method);	1463	im_destroy ();
1470	return false;	1464	return false;
1471	}	1465	}
1472		1466
1473	if (input_style & XIMPreeditArea)	1467	if (input_style & XIMPreeditArea)
1474	IMSetStatusPosition ();	1468	IMSetStatusPosition ();
…		…
1504	s = rxvt_splitcommastring (p);	1498	s = rxvt_splitcommastring (p);
1505	for (i = 0; s[i]; i++)	1499	for (i = 0; s[i]; i++)
1506	{	1500	{
1507	if (*s[i])	1501	if (*s[i])
1508	{	1502	{
1509	STRCPY (buf, "@im=");	1503	strcpy (buf, "@im=");
1510	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1504	strncat (buf, s[i], IMBUFSIZ - 5);
1511	if (IM_get_IC (buf))	1505	if (IM_get_IC (buf))
1512	{	1506	{
1513	found = true;	1507	found = true;
1514	break;	1508	break;
1515	}	1509	}
…		…
1539	}	1533	}
1540		1534
1541	void	1535	void
1542	rxvt_term::IMSetStatusPosition ()	1536	rxvt_term::IMSetStatusPosition ()
1543	{	1537	{
1544	XRectangle preedit_rect, status_rect, *needed_rect;	1538	XRectangle preedit_rect, status_rect, *needed_rect;
1545	XVaNestedList preedit_attr, status_attr;	1539	XVaNestedList preedit_attr, status_attr;
1546		1540
1547	if (Input_Context == NULL	1541	if (!Input_Context
		1542	\|\| !TermWin.focus
1548	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditArea)	1543	\|\| !(input_style & XIMPreeditArea)
1549	\|\| !IMisRunning ())	1544	\|\| !IMisRunning ())
1550	return;	1545	return;
1551		1546
1552	/* Getting the necessary width of preedit area */	1547	/* Getting the necessary width of preedit area */
1553	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1548	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1554	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1549	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1555	XFree (status_attr);	1550	XFree (status_attr);
1556		1551
1557	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1552	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1553	XFree (needed_rect);
1558		1554
1559	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1555	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1560	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1556	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1561		1557
1562	XSetICValues (Input_Context,	1558	XSetICValues (Input_Context,
1563	XNPreeditAttributes, preedit_attr,	1559	XNPreeditAttributes, preedit_attr,
1564	XNStatusAttributes, status_attr, NULL);	1560	XNStatusAttributes, status_attr, NULL);
1565		1561
1566	XFree (preedit_attr);	1562	XFree (preedit_attr);
1567	XFree (status_attr);	1563	XFree (status_attr);
1568	}	1564	}
1569	#endif /* USE_XIM */	1565	#endif /* USE_XIM */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC vs. Revision 1.108 by root, Wed Aug 25 05:03:33 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.108 by root, Wed Aug 25 05:03:33 2004 UTC