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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94	{	97	{
95	compose_char *cc;	98	compose_char *cc;
96		99
97	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	102	cc = (*this)[c1];
100	while (cc)	103	while (cc)
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
111	}
112		113
113	// allocate a new combination	114	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	116	{
116	static int seen;	117	static int seen;
117		118
118	if (!seen++)	119	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		121
121	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
122	}	123	}
123		124
124	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	174	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	177	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	179	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	181	#endif
183	#ifdef POINTER_BLANK	182	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
188	#endif	187	#endif
189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196		194
197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198		196
…		…
226	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
227	delete fontset[i];	225	delete fontset[i];
228	#endif	226	#endif
229	delete fontset[0];	227	delete fontset[0];
230		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bg_destroy ();
		231	#endif
		232
231	if (display)	233	if (display)
232	{	234	{
233	selection_clear ();	235	selection_clear ();
		236	selection_clear (true);
234		237
235	#ifdef USE_XIM	238	#ifdef USE_XIM
236	im_destroy ();	239	im_destroy ();
237	#endif	240	#endif
238	#ifdef XTERM_SCROLLBAR	241	scrollBar.destroy ();
239	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240	if (ShadowGC) XFreeGC (dpy, ShadowGC);
241	#endif
242	#ifdef PLAIN_SCROLLBAR
243	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244	#endif
245	#ifdef NEXT_SCROLLBAR
246	if (blackGC) XFreeGC (dpy, blackGC);
247	if (whiteGC) XFreeGC (dpy, whiteGC);
248	if (grayGC) XFreeGC (dpy, grayGC);
249	if (darkGC) XFreeGC (dpy, darkGC);
250	if (stippleGC) XFreeGC (dpy, stippleGC);
251	if (dimple) XFreePixmap (dpy, dimple);
252	if (upArrow) XFreePixmap (dpy, upArrow);
253	if (downArrow) XFreePixmap (dpy, downArrow);
254	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256	#endif
257	#ifdef RXVT_SCROLLBAR
258	if (topShadowGC) XFreeGC (dpy, topShadowGC);
259	if (botShadowGC) XFreeGC (dpy, botShadowGC);
260	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261	#endif
262	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
263		243
264	delete drawable;	244	delete drawable;
265	// destroy all windows	245	// destroy all windows
266	if (parent[0])	246	if (parent)
267	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
268		248
269	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
270	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
271	{	251	{
272	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
274	pix_colors_unfocused [i].free (this);	254	pix_colors_unfocused [i].free (this);
275	#endif	255	#endif
276	}	256	}
277		257
278	clear ();	258	clear ();
279	}
280		259
281	#ifdef HAVE_BG_PIXMAP
282	bgPixmap.destroy ();
283	#endif
284	display->flush (); /* ideally .put should do this */	260	display->flush (); /* ideally .put should do this */
285	displays.put (display);	261	displays.put (display);
		262	}
286		263
287	scr_release ();	264	scr_release ();
288		265
289	/* clear all resources */	266	/* clear all resources */
290	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
291	free (allocated [i]);	268	free (allocated [i]);
292		269
293	free (selection.text);	270	free (selection.text);
		271	free (selection.clip_text);
294	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
295	free (env_display);	273	free (env_display);
296	free (env_term);	274	free (env_term);
297	free (locale);	275	free (locale);
298	free (v_buffer);	276	free (v_buffer);
299	free (incr_buf);	277
		278	delete selection_req;
300		279
301	delete envv;	280	delete envv;
302	delete argv;	281	delete argv;
303		282
304	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
336	if (display)	315	if (display)
337	{	316	{
338	#if USE_XIM	317	#if USE_XIM
339	im_ev.stop (display);	318	im_ev.stop (display);
340	#endif	319	#endif
341	#if HAVE_SCROLLBARS
342	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
343	#endif
344	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
345	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
346	#endif	323	#endif
347	incr_ev.stop ();
348	termwin_ev.stop (display);	324	termwin_ev.stop (display);
349	vt_ev.stop (display);	325	vt_ev.stop (display);
350	}	326	}
351		327
352	flush_ev.stop ();	328	flush_ev.stop ();
…		…
374	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
375	{	351	{
376	make_current ();	352	make_current ();
377		353
378	delete this;	354	delete this;
		355	}
		356
		357	void
		358	rxvt_term::set_option (uint8_t opt, bool set)
		359	{
		360	if (!opt)
		361	return;
		362
		363	uint8_t mask = 1 << (opt & 7);
		364	uint8_t &val = options [opt >> 3];
		365
		366	val = val & ~mask \| (set ? mask : 0);
379	}	367	}
380		368
381	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
382	/*	370	/*
383	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
397	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
398	{	386	{
399	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
400	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
401	char number[32];	389	char number[32];
402	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
403	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
404	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
405	rxvt_warn ("An X Error occured, trying to continue after report.\n");	393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
406	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
407	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
408	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
409	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
410	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
411	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
412	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
413	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
414	mesg, BUFSIZ);	402	mesg, BUFSIZ);
415	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
416	}	404	}
417	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
418	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
419	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
420	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
421	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
422	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
423	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
424	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
425	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
426	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
427	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
428	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
429	mesg, BUFSIZ);	417	mesg, BUFSIZ);
430	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
431	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
432	mesg, BUFSIZ);	420	mesg, BUFSIZ);
433	else	421	else
434	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
435	mesg, BUFSIZ);	423	mesg, BUFSIZ);
436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
437	}	425	}
438	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
439	mesg, BUFSIZ);	427	mesg, BUFSIZ);
440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
441	}	429	}
442	#endif	430	#endif
443		431
444	int	432	int
…		…
467	DisplayString (display));	455	DisplayString (display));
468	rxvt_emergency_cleanup ();	456	rxvt_emergency_cleanup ();
469	_exit (EXIT_FAILURE);	457	_exit (EXIT_FAILURE);
470	}	458	}
471		459
472	/----------------------------------------------------------------------/
473	void
474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
475	{
476	this->envv = envv;
477
478	SET_R (this);
479	set_locale ("");
480	set_environ (envv); // few things in X do not call setlocale :(
481
482	init_vars ();
483
484	init_secondary ();
485
486	const char **cmd_argv = init_resources (argc, argv);
487
488	#ifdef KEYSYM_RESOURCE
489	keyboard->register_done ();
490	#endif
491
492	#ifdef HAVE_SCROLLBARS
493	if (option (Opt_scrollBar))
494	scrollBar.setIdle (); /* set existence for size calculations */
495	#endif
496
497	pty = ptytty::create ();
498
499	create_windows (argc, argv);
500
501	init_xlocale ();
502
503	scr_reset (); // initialize screen
504
505	#if 0
506	XSynchronize (dpy, True);
507	#endif
508
509	#ifdef HAVE_SCROLLBARS
510	if (option (Opt_scrollBar))
511	resize_scrollbar (); /* create and map scrollbar */
512	#endif
513	#ifdef HAVE_BG_PIXMAP
514	{
515	bgPixmap.set_target (this);
516
517	#ifdef ENABLE_TRANSPARENCY
518	if (option (Opt_transparent))
519	{
520	bgPixmap.set_transparent ();
521
522	#ifdef HAVE_AFTERIMAGE
523	if (rs [Rs_blurradius])
524	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525	#endif
526	if (ISSET_PIXCOLOR (Color_tint))
527	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529	if (rs [Rs_shade])
530	bgPixmap.set_shade (rs [Rs_shade]);
531
532	bgPixmap.set_root_pixmap ();
533	XSelectInput (dpy, display->root, PropertyChangeMask);
534	rootwin_ev.start (display, display->root);
535	}
536	#endif
537
538	#ifdef BG_IMAGE_FROM_FILE
539	if (rs[Rs_backgroundPixmap])
540	{
541	const char *p = rs[Rs_backgroundPixmap];
542
543	if ((p = strchr (p, ';')) != 0)
544	{
545	p++;
546	bgPixmap.set_geometry (p);
547	}
548	else
549	bgPixmap.set_defaultGeometry ();
550
551	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552	if (!bgPixmap.window_position_sensitive ())
553	update_background ();
554	}
555	#endif
556	}
557	#endif
558
559	#if ENABLE_PERL
560	rootwin_ev.start (display, display->root);
561	#endif
562
563	set_colorfgbg ();
564
565	init_command (cmd_argv);
566
567	free (cmd_argv);
568
569	if (pty->pty >= 0)
570	pty_ev.start (pty->pty, ev::READ);
571
572	HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574	#if ENABLE_XEMBED
575	if (rs[Rs_embed])
576	{
577	long info[2] = { 0, XEMBED_MAPPED };
578
579	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580	32, PropModeReplace, (unsigned char *)&info, 2);
581	}
582	#endif
583
584	XMapWindow (dpy, vt);
585	XMapWindow (dpy, parent[0]);
586
587	refresh_check ();
588	}
589
590	static struct sig_handlers	460	static struct sig_handlers
591	{	461	{
592	ev::sig sw_term, sw_int;	462	ev::sig sw_term, sw_int;
593		463
594	/*	464	/*
…		…
609	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
610	w.stop ();	480	w.stop ();
611	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
612	}	482	}
613		483
		484	static void
		485	rxvt_get_ttymode (struct termios *tio)
		486	{
		487	if (tcgetattr (STDIN_FILENO, tio) < 0)
		488	memset (tio, 0, sizeof (struct termios));
		489
		490	for (int i = 0; i < NCCS; i++)
		491	tio->c_cc[i] = VDISABLE;
		492
		493	tio->c_cc[VINTR] = CINTR;
		494	tio->c_cc[VQUIT] = CQUIT;
		495	tio->c_cc[VERASE] = CERASE;
		496	#ifdef VERASE2
		497	tio->c_cc[VERASE2] = CERASE2;
		498	#endif
		499	tio->c_cc[VKILL] = CKILL;
		500	tio->c_cc[VEOF] = CEOF;
		501	tio->c_cc[VSTART] = CSTART;
		502	tio->c_cc[VSTOP] = CSTOP;
		503	tio->c_cc[VSUSP] = CSUSP;
		504	# ifdef VDSUSP
		505	tio->c_cc[VDSUSP] = CDSUSP;
		506	# endif
		507	# ifdef VREPRINT
		508	tio->c_cc[VREPRINT] = CRPRNT;
		509	# endif
		510	# ifdef VDISCRD
		511	tio->c_cc[VDISCRD] = CFLUSH;
		512	# endif
		513	# ifdef VWERSE
		514	tio->c_cc[VWERSE] = CWERASE;
		515	# endif
		516	# ifdef VLNEXT
		517	tio->c_cc[VLNEXT] = CLNEXT;
		518	# endif
		519	# ifdef VSTATUS
		520	tio->c_cc[VSTATUS] = CSTATUS;
		521	# endif
		522
		523	# if VMIN != VEOF
		524	tio->c_cc[VMIN] = 1;
		525	# endif
		526	# if VTIME != VEOL
		527	tio->c_cc[VTIME] = 0;
		528	# endif
		529
		530	/* input modes */
		531	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		532	# ifdef IMAXBEL
		533	\| IMAXBEL
		534	# endif
		535	\| IXON);
		536
		537	/* output modes */
		538	tio->c_oflag = (OPOST \| ONLCR);
		539
		540	/* control modes */
		541	tio->c_cflag = (CS8 \| CREAD);
		542
		543	/* local modes */
		544	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		545	# if defined (ECHOCTL) && defined (ECHOKE)
		546	\| ECHOCTL \| ECHOKE
		547	# endif
		548	\| ECHOE \| ECHOK);
		549	}
		550
614	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
615		552
616	void	553	void
617	rxvt_init ()	554	rxvt_init ()
618	{	555	{
619	ptytty::init ();	556	assert (("fontMask must not overlap other RS masks",
		557	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
620		558
		559	rxvt_get_ttymode (&rxvt_term::def_tio);
		560
		561	// get rid of stdin/stdout as we don't need them, to free resources
		562	dup2 (STDERR_FILENO, STDIN_FILENO);
		563	dup2 (STDERR_FILENO, STDOUT_FILENO);
		564
621	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623		567
624	rxvt_environ = environ;	568	rxvt_environ = environ;
625		569
626	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
627	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
628		572
629	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
631
632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
633	/* signal (SIGURG, SIG_DFL); */
634		575
635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
637	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
638		579
…		…
646	*/	587	*/
647	void	588	void
648	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	589	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
649	{	590	{
650	short recalc_x, recalc_y;	591	short recalc_x, recalc_y;
651	int x, y, sb_w, flags;	592	int x, y, flags;
652	unsigned int w, h;	593	unsigned int w, h;
653	unsigned int max_width, max_height;	594	unsigned int max_width, max_height;
654		595
655	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	596	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
656	szHint.win_gravity = NorthWestGravity;	597	szHint.win_gravity = NorthWestGravity;
…		…
666	if (rs[Rs_geometry])	607	if (rs[Rs_geometry])
667	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	608	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
668		609
669	if (flags & WidthValue)	610	if (flags & WidthValue)
670	{	611	{
		612	if (!w)
		613	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		614
671	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	615	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
672	szHint.flags \|= USSize;	616	szHint.flags \|= USSize;
673	}	617	}
674		618
675	if (flags & HeightValue)	619	if (flags & HeightValue)
676	{	620	{
		621	if (!h)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
677	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	624	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
678	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
679	}	626	}
680		627
681	if (flags & XValue)	628	if (flags & XValue)
682	{	629	{
…		…
713	max_width = MAX_COLS * fwidth;	660	max_width = MAX_COLS * fwidth;
714	max_height = MAX_ROWS * fheight;	661	max_height = MAX_ROWS * fheight;
715		662
716	szHint.base_width = szHint.base_height = 2 * int_bwidth;	663	szHint.base_width = szHint.base_height = 2 * int_bwidth;
717		664
718	sb_w = 0;
719	window_vt_x = window_vt_y = int_bwidth;	665	window_vt_x = window_vt_y = int_bwidth;
720		666
721	if (scrollBar.state)	667	if (scrollBar.state)
722	{	668	{
723	sb_w = scrollbar_TotalWidth ();	669	int sb_w = scrollBar.total_width ();
724	szHint.base_width += sb_w;	670	szHint.base_width += sb_w;
725		671
726	if (!option (Opt_scrollBar_right))	672	if (!option (Opt_scrollBar_right))
727	window_vt_x += sb_w;	673	window_vt_x += sb_w;
728	}	674	}
…		…
752	{	698	{
753	min_it (height, max_height);	699	min_it (height, max_height);
754	szHint.height = szHint.base_height + height;	700	szHint.height = szHint.base_height + height;
755	}	701	}
756		702
757	if (scrollBar.state && option (Opt_scrollBar_right))
758	window_sb_x = szHint.width - sb_w;
759
760	if (recalc_x)	703	if (recalc_x)
761	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	704	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
762		705
763	if (recalc_y)	706	if (recalc_y)
764	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765		708
766	ncol = width / fwidth;	709	ncol = width / fwidth;
767	nrow = height / fheight;	710	nrow = height / fheight;
768	}	711	}
769		712
770	/----------------------------------------------------------------------/	713	/----------------------------------------------------------------------/
771	/*	714	/*
…		…
782		725
783	ws.ws_col = ncol;	726	ws.ws_col = ncol;
784	ws.ws_row = nrow;	727	ws.ws_row = nrow;
785	ws.ws_xpixel = width;	728	ws.ws_xpixel = width;
786	ws.ws_ypixel = height;	729	ws.ws_ypixel = height;
787	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	730	ioctl (pty->pty, TIOCSWINSZ, &ws);
788		731
789	#if 0	732	#if 0
790	// TIOCSWINSZ is supposed to do this automatically and correctly	733	// TIOCSWINSZ is supposed to do this automatically and correctly
791	if (cmd_pid) /* force through to the command */	734	if (cmd_pid) /* force through to the command */
792	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
793	#endif	736	#endif
794	}	737	}
795		738
796	/----------------------------------------------------------------------/	739	/----------------------------------------------------------------------/
797	/* set_fonts () - load and set the various fonts	740	/* load and set the various fonts */
798	*
799	* init = 1 - initialize
800	*
801	* fontname == FONT_UP - switch to bigger font
802	* fontname == FONT_DN - switch to smaller font
803	*/
804	bool	741	bool
805	rxvt_term::set_fonts ()	742	rxvt_term::set_fonts ()
806	{	743	{
807	rxvt_fontset *fs = new rxvt_fontset (this);	744	rxvt_fontset *fs = new rxvt_fontset (this);
808	rxvt_fontprop prop;	745	rxvt_fontprop prop;
…		…
822	#endif	759	#endif
823		760
824	delete fontset[0];	761	delete fontset[0];
825	fontset[0] = fs;	762	fontset[0] = fs;
826		763
827	prop = (*fs)[1]->properties ();	764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
828	prop.height += lineSpace;	765	prop.height += lineSpace;
		766	prop.width += letterSpace;
829		767
830	fs->set_prop (prop, false);	768	fs->set_prop (prop, false);
831		769
832	fwidth = prop.width;	770	fwidth = prop.width;
833	fheight = prop.height;	771	fheight = prop.height;
…		…
864	#else	802	#else
865	fontset[style] = fontset[0];	803	fontset[style] = fontset[0];
866	#endif	804	#endif
867	}	805	}
868		806
869	if (parent[0])	807	if (parent)
870	{	808	{
871	resize_all_windows (0, 0, 0);	809	resize_all_windows (0, 0, 0);
872	scr_remap_chars ();	810	scr_remap_chars ();
873	scr_touch (true);	811	scr_touch (true);
874	}	812	}
…		…
877	}	815	}
878		816
879	void	817	void
880	rxvt_term::set_string_property (Atom prop, const char *str, int len)	818	rxvt_term::set_string_property (Atom prop, const char *str, int len)
881	{	819	{
882	XChangeProperty (dpy, parent[0],	820	XChangeProperty (dpy, parent,
883	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
884	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
885	}	823	}
886		824
887	void	825	void
		826	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		827	{
		828	XTextProperty ct;
		829
		830	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		831	{
		832	XSetTextProperty (dpy, parent, &ct, prop);
		833	XFree (ct.value);
		834	}
		835	}
		836
		837	void
888	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	838	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
889	{	839	{
890	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
891	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
892		842
893	XChangeProperty (dpy, parent[0],	843	XChangeProperty (dpy, parent,
894	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	844	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
895	(const unsigned char *)s, strlen (s));	845	(const unsigned char *)s, strlen (s));
896		846
897	free (s);	847	free (s);
898	free (ws);	848	free (ws);
…		…
902	/----------------------------------------------------------------------/	852	/----------------------------------------------------------------------/
903	/* xterm sequences - title, iconName, color (exptl) */	853	/* xterm sequences - title, iconName, color (exptl) */
904	void	854	void
905	rxvt_term::set_title (const char *str)	855	rxvt_term::set_title (const char *str)
906	{	856	{
907	set_string_property (XA_WM_NAME, str);	857	set_mbstring_property (XA_WM_NAME, str);
908	#if ENABLE_EWMH	858	#if ENABLE_EWMH
909	set_utf8_property (xa[XA_NET_WM_NAME], str);	859	set_utf8_property (xa[XA_NET_WM_NAME], str);
910	#endif	860	#endif
911	}	861	}
912		862
913	void	863	void
914	rxvt_term::set_icon_name (const char *str)	864	rxvt_term::set_icon_name (const char *str)
915	{	865	{
916	set_string_property (XA_WM_ICON_NAME, str);	866	set_mbstring_property (XA_WM_ICON_NAME, str);
917	#if ENABLE_EWMH	867	#if ENABLE_EWMH
918	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	868	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
919	#endif	869	#endif
920	}	870	}
921		871
922	void	872	void
923	rxvt_term::set_window_color (int idx, const char *color)	873	rxvt_term::set_window_color (int idx, const char *color)
924	{	874	{
925	#ifdef XTERM_COLOR_CHANGE	875	#ifdef XTERM_COLOR_CHANGE
926	rxvt_color xcol;	876	rxvt_color xcol;
927	int i;
928		877
929	if (color == NULL \|\| *color == '\0')	878	if (color == NULL \|\| *color == '\0')
930	return;	879	return;
931		880
932	color = strdup (color);	881	color = strdup (color);
…		…
934	rs[Rs_color + idx] = color;	883	rs[Rs_color + idx] = color;
935		884
936	/* handle color aliases */	885	/* handle color aliases */
937	if (isdigit (*color))	886	if (isdigit (*color))
938	{	887	{
939	i = atoi (color);	888	int i = atoi (color);
940		889
941	if (i >= 8 && i <= 15)	890	if (i >= 8 && i <= 15)
942	{	891	{
943	/* bright colors */	892	/* bright colors */
944	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	893	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
994	void	943	void
995	rxvt_term::set_colorfgbg ()	944	rxvt_term::set_colorfgbg ()
996	{	945	{
997	unsigned int i;	946	unsigned int i;
998	const char *xpmb = "";	947	const char *xpmb = "";
999	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	948	char fstr[] = "default";
		949	char bstr[] = "default";
1000		950
1001	strcpy (fstr, "default");
1002	strcpy (bstr, "default");
1003	for (i = Color_Black; i <= Color_White; i++)	951	for (i = Color_Black; i <= Color_White; i++)
1004	if (pix_colors[Color_fg] == pix_colors[i])	952	if (pix_colors[Color_fg] == pix_colors[i])
1005	{	953	{
1006	sprintf (fstr, "%d", (i - Color_Black));	954	sprintf (fstr, "%d", i - Color_Black);
1007	break;	955	break;
1008	}	956	}
1009		957
1010	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
1011	if (pix_colors[Color_bg] == pix_colors[i])	959	if (pix_colors[Color_bg] == pix_colors[i])
1012	{	960	{
1013	sprintf (bstr, "%d", (i - Color_Black));	961	sprintf (bstr, "%d", i - Color_Black);
1014	#ifdef BG_IMAGE_FROM_FILE	962	#ifdef BG_IMAGE_FROM_FILE
1015	xpmb = "default;";	963	xpmb = "default;";
1016	#endif	964	#endif
1017	break;	965	break;
1018	}	966	}
…		…
1048	int old_width = szHint.width;	996	int old_width = szHint.width;
1049	int old_height = szHint.height;	997	int old_height = szHint.height;
1050		998
1051	window_calc (newwidth, newheight);	999	window_calc (newwidth, newheight);
1052		1000
1053	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1001	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1002
		1003	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1004	if (set_hint)
		1005	{
		1006	szHint.flags &= ~(PBaseSize \| PResizeInc);
1054	XSetWMNormalHints (dpy, parent[0], &szHint);	1007	XSetWMNormalHints (dpy, parent, &szHint);
		1008	szHint.flags \|= PBaseSize \| PResizeInc;
		1009	}
1055		1010
1056	if (!ignoreparent)	1011	if (!ignoreparent)
1057	{	1012	{
1058	#ifdef SMART_RESIZE	1013	#ifdef SMART_RESIZE
1059	/*	1014	/*
…		…
1063	int x, y, x1, y1;	1018	int x, y, x1, y1;
1064	int dx, dy;	1019	int dx, dy;
1065	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1020	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1066	Window unused_cr;	1021	Window unused_cr;
1067		1022
1068	XTranslateCoordinates (dpy, parent[0], display->root,	1023	XTranslateCoordinates (dpy, parent, display->root,
1069	0, 0, &x, &y, &unused_cr);	1024	0, 0, &x, &y, &unused_cr);
1070	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1025	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1071	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1026	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1072	/*	1027	/*
1073	* if display->root isn't the parent window, a WM will probably have offset	1028	* if display->root isn't the parent window, a WM will probably have offset
1074	* our position for handles and decorations. Counter it	1029	* our position for handles and decorations. Counter it
1075	*/	1030	*/
…		…
1092	if (y < y1) /* top half */	1047	if (y < y1) /* top half */
1093	dy = 0;	1048	dy = 0;
1094	else if (y == y1) /* exact center */	1049	else if (y == y1) /* exact center */
1095	dy /= 2;	1050	dy /= 2;
1096		1051
1097	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1052	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1098	szHint.width, szHint.height);	1053	szHint.width, szHint.height);
1099	#else	1054	#else
1100	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1055	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1101	#endif	1056	#endif
1102	}	1057	}
		1058
		1059	if (set_hint)
		1060	XSetWMNormalHints (dpy, parent, &szHint);
1103		1061
1104	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1062	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1105		1063
1106	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1064	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1107	{	1065	{
1108	if (scrollBar.state)	1066	if (scrollBar.state)
1109	{	1067	scrollBar.resize ();
1110	XMoveResizeWindow (dpy, scrollBar.win,
1111	window_sb_x, 0,
1112	scrollbar_TotalWidth (), szHint.height);
1113	resize_scrollbar ();
1114	}
1115		1068
1116	XMoveResizeWindow (dpy, vt,	1069	XMoveResizeWindow (dpy, vt,
1117	window_vt_x, window_vt_y,	1070	window_vt_x, window_vt_y,
1118	width, height);	1071	width, height);
1119		1072
1120	#ifdef HAVE_BG_PIXMAP	1073	#ifdef HAVE_BG_PIXMAP
1121	if (bgPixmap.window_size_sensitive ())	1074	if (bg_window_size_sensitive ())
1122	update_background ();	1075	update_background ();
1123	#endif	1076	#endif
1124
1125	scr_clear ();
1126	}	1077	}
1127		1078
1128	if (fix_screen \|\| old_height == 0)	1079	if (fix_screen \|\| old_height == 0)
1129	scr_reset ();	1080	scr_reset ();
1130
1131	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1132	//scr_touch (false);
1133
1134	#ifdef HAVE_BG_PIXMAP
1135	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1136	// if (bgPixmap.pixmap)
1137	// scr_touch (false);
1138	#endif
1139		1081
1140	#ifdef USE_XIM	1082	#ifdef USE_XIM
1141	IMSetPosition ();	1083	IMSetPosition ();
1142	#endif	1084	#endif
1143	}	1085	}
…		…
1209		1151
1210	/* Checking whether input method is running. */	1152	/* Checking whether input method is running. */
1211	bool	1153	bool
1212	rxvt_term::IMisRunning ()	1154	rxvt_term::IMisRunning ()
1213	{	1155	{
1214	char *p;
1215	Atom atom;	1156	Atom atom;
1216	Window win;	1157	Window win;
1217	char server[IMBUFSIZ];	1158	char server[IMBUFSIZ];
1218		1159
1219	/* get current locale modifier */	1160	/* get current locale modifier */
1220	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1161	if (char *p = XSetLocaleModifiers (0))
1221	{	1162	{
1222	strcpy (server, "@server=");	1163	strcpy (server, "@server=");
1223	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1164	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1224		1165
1225	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1166	if (p = strchr (server + 1, '@')) /* first one only */
1226	*p = '\0';	1167	*p = '\0';
1227		1168
1228	atom = XInternAtom (dpy, server, False);	1169	atom = XInternAtom (dpy, server, False);
1229	win = XGetSelectionOwner (dpy, atom);	1170	win = XGetSelectionOwner (dpy, atom);
1230		1171
1231	if (win != None)	1172	if (win != None)
1232	return True;	1173	return true;
1233	}	1174	}
1234		1175
1235	return False;	1176	return false;
1236	}	1177	}
1237		1178
1238	void	1179	void
1239	rxvt_term::IMSendSpot ()	1180	rxvt_term::IMSendSpot ()
1240	{	1181	{
…		…
1297		1238
1298	term->make_current ();	1239	term->make_current ();
1299		1240
1300	if (text)	1241	if (text)
1301	{	1242	{
1302	void *str;	1243	wchar_t *str;
1303		1244
1304	if (!text->encoding_is_wchar && text->string.multi_byte)	1245	if (!text->encoding_is_wchar && text->string.multi_byte)
1305	{	1246	{
1306	// of course, X makes it ugly again	1247	// of course, X makes it ugly again
1307	if (term->rs[Rs_imLocale])	1248	if (term->rs[Rs_imLocale])
1308	SET_LOCALE (term->rs[Rs_imLocale]);	1249	SET_LOCALE (term->rs[Rs_imLocale]);
1309		1250
1310	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1251	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1311	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1252	mbstowcs (str, text->string.multi_byte, text->length + 1);
1312		1253
1313	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1314	SET_LOCALE (term->locale);	1255	SET_LOCALE (term->locale);
1315	}	1256	}
1316	else	1257	else
1317	str = (void *)text->string.wide_char;	1258	str = text->string.wide_char;
1318		1259
1319	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1260	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1320	DT_INT, call_data->caret,	1261	DT_INT, call_data->caret,
1321	DT_INT, call_data->chg_first,	1262	DT_INT, call_data->chg_first,
1322	DT_INT, call_data->chg_length,	1263	DT_INT, call_data->chg_length,
…		…
1360	XRectangle rect, status_rect, needed_rect;	1301	XRectangle rect, status_rect, needed_rect;
1361	unsigned long fg, bg;	1302	unsigned long fg, bg;
1362	const char *p;	1303	const char *p;
1363	char **s;	1304	char **s;
1364	XIMStyles *xim_styles;	1305	XIMStyles *xim_styles;
1365	#ifdef ENABLE_XIM_ONTHESPOT
1366	XIMCallback xcb[4];
1367	#endif
1368		1306
1369	set_environ (envv);	1307	set_environ (envv);
1370		1308
1371	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1372	return false;	1310	return false;
…		…
1393	p = pet[pi];	1331	p = pet[pi];
1394		1332
1395	if (!p)	1333	if (!p)
1396	continue;	1334	continue;
1397		1335
1398	s = rxvt_splitcommastring (p);	1336	s = rxvt_strsplit (',', p);
1399		1337
1400	for (i = found = 0; !found && s[i]; i++)	1338	for (i = found = 0; !found && s[i]; i++)
1401	{	1339	{
1402	if (!strcmp (s[i], "OverTheSpot"))	1340	if (!strcmp (s[i], "OverTheSpot"))
1403	input_style = XIMPreeditPosition \| XIMStatusNothing;	1341	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1415	input_style = XIMPreeditNothing \| XIMStatusNothing;	1353	input_style = XIMPreeditNothing \| XIMStatusNothing;
1416		1354
1417	for (j = 0; j < xim_styles->count_styles; j++)	1355	for (j = 0; j < xim_styles->count_styles; j++)
1418	if (input_style == xim_styles->supported_styles[j])	1356	if (input_style == xim_styles->supported_styles[j])
1419	{	1357	{
1420	rxvt_freecommastring (s);	1358	rxvt_free_strsplit (s);
1421		1359
1422	found = 1;	1360	found = 1;
1423	goto foundpet;	1361	goto foundpet;
1424	}	1362	}
1425		1363
1426	}	1364	}
1427		1365
1428	rxvt_freecommastring (s);	1366	rxvt_free_strsplit (s);
1429	}	1367	}
1430		1368
1431	foundpet:	1369	foundpet:
1432		1370
1433	XFree (xim_styles);	1371	XFree (xim_styles);
…		…
1512	NULL);	1450	NULL);
1513	}	1451	}
1514	#if ENABLE_XIM_ONTHESPOT	1452	#if ENABLE_XIM_ONTHESPOT
1515	else if (input_style & XIMPreeditCallbacks)	1453	else if (input_style & XIMPreeditCallbacks)
1516	{	1454	{
		1455	XIMCallback xcb[4];
		1456
1517	im_set_position (spot);	1457	im_set_position (spot);
1518		1458
1519	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1459	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1520	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1460	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1521	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1461	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1536	#endif	1476	#endif
1537		1477
1538	Input_Context = XCreateIC (xim,	1478	Input_Context = XCreateIC (xim,
1539	XNInputStyle, input_style,	1479	XNInputStyle, input_style,
1540	XNClientWindow, vt,	1480	XNClientWindow, vt,
1541	XNFocusWindow, parent[0],	1481	XNFocusWindow, parent,
1542	preedit_attr ? XNPreeditAttributes : NULL,	1482	preedit_attr ? XNPreeditAttributes : NULL,
1543	preedit_attr,	1483	preedit_attr,
1544	status_attr ? XNStatusAttributes : NULL,	1484	status_attr ? XNStatusAttributes : NULL,
1545	status_attr, NULL);	1485	status_attr, NULL);
1546		1486
…		…
1589	p = rs[Rs_inputMethod];	1529	p = rs[Rs_inputMethod];
1590	if (p && *p)	1530	if (p && *p)
1591	{	1531	{
1592	bool found = false;	1532	bool found = false;
1593		1533
1594	s = rxvt_splitcommastring (p);	1534	s = rxvt_strsplit (',', p);
1595		1535
1596	for (i = 0; s[i]; i++)	1536	for (i = 0; s[i]; i++)
1597	{	1537	{
1598	if (*s[i])	1538	if (*s[i])
1599	{	1539	{
…		…
1605	break;	1545	break;
1606	}	1546	}
1607	}	1547	}
1608	}	1548	}
1609		1549
1610	rxvt_freecommastring (s);	1550	rxvt_free_strsplit (s);
1611		1551
1612	if (found)	1552	if (found)
1613	goto done;	1553	goto done;
1614	}	1554	}
1615		1555
…		…
1675		1615
1676	void	1616	void
1677	rxvt_term::get_window_origin (int &x, int &y)	1617	rxvt_term::get_window_origin (int &x, int &y)
1678	{	1618	{
1679	Window cr;	1619	Window cr;
1680	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1681	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1682	}	1621	}
1683		1622
1684	Pixmap	1623	Pixmap
1685	rxvt_term::get_pixmap_property (int prop_id)	1624	rxvt_term::get_pixmap_property (Atom property)
1686	{	1625	{
1687	if (prop_id > 0 && prop_id < NUM_XA)	1626	Pixmap pixmap = None;
1688	if (xa[prop_id])	1627
1689	{
1690	int aformat;	1628	int aformat;
1691	unsigned long nitems, bytes_after;	1629	unsigned long nitems, bytes_after;
1692	Atom atype;	1630	Atom atype;
1693	unsigned char *prop = NULL;	1631	unsigned char *prop;
1694	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1632	int result = XGetWindowProperty (dpy, display->root, property,
1695	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1633	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1696	&nitems, &bytes_after, &prop);	1634	&nitems, &bytes_after, &prop);
1697	if (result == Success && prop && atype == XA_PIXMAP)	1635	if (result == Success)
		1636	{
		1637	if (atype == XA_PIXMAP)
1698	return (Pixmap )prop;	1638	pixmap = (Pixmap )prop;
		1639	XFree (prop);
1699	}	1640	}
1700		1641
1701	return None;	1642	return pixmap;
1702	}	1643	}
1703		1644
1704	#ifdef HAVE_BG_PIXMAP	1645	#ifdef HAVE_BG_PIXMAP
1705	# if TRACE_PIXMAPS
1706	# undef update_background
1707	void
1708	rxvt_term::trace_update_background (const char *file, int line)
1709	{
1710	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1711	update_background ();
1712	}
1713	# endif
1714		1646
1715	void	1647	void
1716	rxvt_term::update_background ()	1648	rxvt_term::update_background ()
1717	{	1649	{
1718	if (update_background_ev.is_active ())	1650	if (update_background_ev.is_active ())
1719	return;	1651	return;
1720		1652
1721	bgPixmap.invalidate ();	1653	bg_invalidate ();
1722		1654
1723	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1724		1656
1725	if (to_wait <= 0.)	1657	if (to_wait <= 0.)
1726	bgPixmap.render ();	1658	bg_render ();
1727	else	1659	else
1728	update_background_ev.start (to_wait);	1660	update_background_ev.start (to_wait);
1729	}	1661	}
1730		1662
1731	void	1663	void
1732	rxvt_term::update_background_cb (ev::timer &w, int revents)	1664	rxvt_term::update_background_cb (ev::timer &w, int revents)
1733	{	1665	{
1734	make_current ();	1666	make_current ();
1735		1667
1736	update_background_ev.stop ();	1668	update_background_ev.stop ();
1737	bgPixmap.render ();	1669	bg_render ();
1738	refresh_check ();	1670	refresh_check ();
1739	}	1671	}
1740		1672
1741	#endif /* HAVE_BG_PIXMAP */	1673	#endif /* HAVE_BG_PIXMAP */
1742		1674

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC vs. Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC