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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.335 by ayin, Tue Jun 26 15:17:24 2007 UTC vs.
Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC

…		…
95	XK_Shift_L, 0x21e7,	95	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	96	XK_Shift_R, 0x21e7,
97		97
98	XK_Shift_Lock, 0x21eb,	98	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,	99	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	100	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	101	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	102	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	103	XK_ISO_Level3_Lock, 0x21ef,
105	XK_ISO_Group_Lock, 0x21f0,	104	XK_ISO_Group_Lock, 0x21f0,
…		…
519	# endif	518	# endif
520	return;	519	return;
521	}	520	}
522	else	521	else
523	{	522	{
524	# if ENABLE_OVERLAY	523	# if ISO_14755
525	scr_overlay_off ();	524	scr_overlay_off ();
526	# endif	525	# endif
527	iso14755buf = 0;	526	iso14755buf = 0;
528	}	527	}
529	}	528	}
530	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	529	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
531	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	530	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))
532	if (!(iso14755buf & ISO_14755_STARTED))	531	if (!(iso14755buf & ISO_14755_STARTED))
533	{	532	{
534	iso14755buf \|= ISO_14755_STARTED;	533	iso14755buf \|= ISO_14755_STARTED;
535	# if ENABLE_OVERLAY	534	# if ISO_14755
536	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537	scr_overlay_set (0, 0, "ISO 14755 mode");	536	scr_overlay_set (0, 0, "ISO 14755 mode");
538	# endif	537	# endif
539	}	538	}
540	#endif	539	#endif
…		…
548	#endif	547	#endif
549		548
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	550	{
552	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	553	newlen = 1;
		554	#ifdef XK_KP_Home
		555	static const KeySym keypadtrans[] = {
		556	XK_KP_7, // XK_KP_Home
		557	XK_KP_4, // XK_KP_Left
		558	XK_KP_8, // XK_KP_Up
		559	XK_KP_6, // XK_KP_Right
		560	XK_KP_2, // XK_KP_Down
		561	#ifndef UNSHIFTED_SCROLLKEYS
		562	XK_KP_9, // XK_KP_Prior
		563	XK_KP_3, // XK_KP_Next
		564	#else
		565	XK_Prior,
		566	XK_Next,
		567	#endif
		568	XK_KP_1, // XK_KP_End
		569	XK_KP_5, // XK_KP_Begin
		570	};
		571
		572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		573	{
		574	unsigned int index = keysym - XK_KP_Home;
		575	keysym = kp ? keypadtrans[index] : XK_Home + index;
		576	}
		577	else if (keysym == XK_KP_Insert)
		578	keysym = kp ? XK_KP_0 : XK_Insert;
		579	#ifndef NO_DELETE_KEY
		580	else if (keysym == XK_KP_Delete)
		581	keysym = kp ? XK_KP_Decimal : XK_Delete;
		582	#endif
		583	#endif
554	switch (keysym)	584	switch (keysym)
555	{	585	{
556	#ifndef NO_BACKSPACE_KEY	586	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	587	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	588	if (priv_modes & PrivMode_HaveBackSpace)
…		…
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	590	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';	591	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';	592	kbuf[1] = '\0';
563	}	593	}
564	else	594	else
565	strcpy (kbuf, key_backspace);	595	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	596	break;
567	#endif	597	#endif
568	#ifndef NO_DELETE_KEY	598	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Prior
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:	599	case XK_Delete:
580	strcpy (kbuf, key_delete);	600	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	601	break;
582	#endif	602	#endif
583	case XK_Tab:	603	case XK_Tab:
584	if (shft)	604	if (shft)
585	strcpy (kbuf, "\033[Z");	605	strcpy (kbuf, "\033[Z");
…		…
595	#endif	615	#endif
596	newlen = 0;	616	newlen = 0;
597	}	617	}
598	break;	618	break;
599		619
600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606	{
607	strcpy (kbuf, "\033OZ");
608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
609	break;
610	}
611	else
612	/* translate to std. cursor key */
613	keysym = XK_Left + (keysym - XK_KP_Left);
614	/* FALLTHROUGH */
615	#endif
616	case XK_Up: /* "\033[A" */	620	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	621	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	622	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	623	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	624	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	634	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	635	kbuf[1] = 'O';
632	break;	636	break;
633		637
634	#ifndef UNSHIFTED_SCROLLKEYS	638	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:	639	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	640	strcpy (kbuf, "\033[5~");
647	break;	641	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:	642	case XK_Next:
659	strcpy (kbuf, "\033[6~");	643	strcpy (kbuf, "\033[6~");
660	break;	644	break;
661	#endif	645	#endif
662	case XK_KP_Enter:	646	case XK_KP_Enter:
663	/* allow shift to override */	647	/* allow shift to override */
664	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	648	if (kp)
665	{	649	{
666	strcpy (kbuf, "\033OM");	650	strcpy (kbuf, "\033OM");
667	break;	651	break;
668	}	652	}
669		653
…		…
681	kbuf[0] = '\015';	665	kbuf[0] = '\015';
682	kbuf[1] = '\0';	666	kbuf[1] = '\0';
683	}	667	}
684	break;	668	break;
685		669
686	#ifdef XK_KP_Begin
687	case XK_KP_Begin:
688	strcpy (kbuf, "\033Ou");
689	break;
690
691	#endif
692	case XK_KP_F1: /* "\033OP" */	670	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	671	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	672	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	673	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	674	strcpy (kbuf, "\033OP");
…		…
712	case XK_KP_6: /* "\033Ov" : "6" */	690	case XK_KP_6: /* "\033Ov" : "6" */
713	case XK_KP_7: /* "\033Ow" : "7" */	691	case XK_KP_7: /* "\033Ow" : "7" */
714	case XK_KP_8: /* "\033Ox" : "8" */	692	case XK_KP_8: /* "\033Ox" : "8" */
715	case XK_KP_9: /* "\033Oy" : "9" */	693	case XK_KP_9: /* "\033Oy" : "9" */
716	/* allow shift to override */	694	/* allow shift to override */
717	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	695	if (kp)
718	{	696	{
719	strcpy (kbuf, "\033Oj");	697	strcpy (kbuf, "\033Oj");
720	kbuf[2] += (keysym - XK_KP_Multiply);	698	kbuf[2] += (keysym - XK_KP_Multiply);
721	}	699	}
722	else	700	else
…		…
728		706
729	case XK_Find:	707	case XK_Find:
730	strcpy (kbuf, "\033[1~");	708	strcpy (kbuf, "\033[1~");
731	break;	709	break;
732		710
733	#ifdef XK_KP_End
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:	711	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	712	strcpy (kbuf, "\033[2~");
745	break;	713	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	714	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	715	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	719	strcpy (kbuf, "\033[3~");
752	break;	720	break;
753	case XK_Select:	721	case XK_Select:
754	strcpy (kbuf, "\033[4~");	722	strcpy (kbuf, "\033[4~");
755	break;	723	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:	724	case XK_End:
767	strcpy (kbuf, KS_END);	725	strcpy (kbuf, KS_END);
768	break;	726	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:	727	case XK_Home:
780	strcpy (kbuf, KS_HOME);	728	strcpy (kbuf, KS_HOME);
781	break;	729	break;
782		730
783	#define FKEY(n, fkey) \	731	#define FKEY(n, fkey) \
…		…
934	#if ENABLE_FRILLS \|\| ISO_14755	882	#if ENABLE_FRILLS \|\| ISO_14755
935	// ISO 14755 support	883	// ISO 14755 support
936	if (iso14755buf)	884	if (iso14755buf)
937	if (iso14755buf & ISO_14755_52)	885	if (iso14755buf & ISO_14755_52)
938	{	886	{
939	# if ENABLE_OVERLAY	887	# if ISO_14755
940	scr_overlay_off ();	888	scr_overlay_off ();
941	# endif	889	# endif
942	# if ISO_14755	890	# if ISO_14755
943	// iso14755 part 5.2 handling: release time	891	// iso14755 part 5.2 handling: release time
944	// first: controls	892	// first: controls
…		…
967		915
968	return;	916	return;
969	}	917	}
970	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))	918	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
971	{	919	{
972	# if ENABLE_OVERLAY	920	# if ISO_14755
973	scr_overlay_off ();	921	scr_overlay_off ();
974	# endif	922	# endif
975	if (iso14755buf & ISO_14755_51)	923	if (iso14755buf & ISO_14755_51)
976	commit_iso14755 ();	924	commit_iso14755 ();
977	#if ISO_14755	925	#if ISO_14755
…		…
1035	void	983	void
1036	rxvt_term::flush ()	984	rxvt_term::flush ()
1037	{	985	{
1038	flush_ev.stop ();	986	flush_ev.stop ();
1039		987
1040	#ifdef ENABLE_TRANSPARENCY	988	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	989	if (bgPixmap.check_clearChanged ())
1042	{	990	{
1043	want_full_refresh = 0;	991	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	992	scr_touch (false);
1046	}	993	}
1047	#endif	994	#endif
1048		995
1049	if (want_refresh)	996	if (want_refresh)
…		…
1095		1042
1096	display->flush ();	1043	display->flush ();
1097	}	1044	}
1098		1045
1099	void	1046	void
1100	rxvt_term::check_cb (check_watcher &w)	1047	rxvt_term::prepare_cb (ev::prepare &w, int revents)
1101	{	1048	{
1102	make_current ();	1049	make_current ();
1103		1050
1104	display->flush ();	1051	display->flush ();
1105		1052
1106	if (want_refresh && !flush_ev.active)	1053	if (want_refresh && !ev_is_active (&flush_ev))
1107	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1054	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1108	}	1055	}
1109		1056
1110	void	1057	void
1111	rxvt_term::flush_cb (time_watcher &w)	1058	rxvt_term::flush_cb (ev::timer &w, int revents)
1112	{	1059	{
1113	make_current ();	1060	make_current ();
1114		1061
1115	refresh_count = 0;	1062	refresh_count = 0;
1116	flush ();	1063	flush ();
1117	}	1064	}
1118		1065
1119	#ifdef CURSOR_BLINK	1066	#ifdef CURSOR_BLINK
1120	void	1067	void
1121	rxvt_term::cursor_blink_cb (time_watcher &w)	1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122	{	1069	{
1123	hidden_cursor = !hidden_cursor;	1070	hidden_cursor = !hidden_cursor;
1124	want_refresh = 1;	1071	want_refresh = 1;
1125
1126	w.start (w.at + CURSOR_BLINK_INTERVAL);
1127	}	1072	}
1128	#endif	1073	#endif
1129		1074
1130	#ifdef TEXT_BLINK	1075	#ifdef TEXT_BLINK
1131	void	1076	void
1132	rxvt_term::text_blink_cb (time_watcher &w)	1077	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133	{	1078	{
1134	if (scr_refresh_rend (RS_Blink, RS_Blink))	1079	if (scr_refresh_rend (RS_Blink, RS_Blink))
1135	{	1080	{
1136	hidden_text = !hidden_text;	1081	hidden_text = !hidden_text;
1137	want_refresh = 1;	1082	want_refresh = 1;
1138	w.start (w.at + TEXT_BLINK_INTERVAL);
1139	}	1083	}
		1084	else
		1085	w.stop ();
1140	}	1086	}
1141	#endif	1087	#endif
1142		1088
1143	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1089	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144	void	1090	void
1145	rxvt_term::cont_scroll_cb (time_watcher &w)	1091	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146	{	1092	{
1147	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1093	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1148	scr_page (scrollbar_isUp() ? UP : DN, 1))	1094	scr_page (scrollbar_isUp() ? UP : DN, 1))
1149	{
1150	want_refresh = 1;	1095	want_refresh = 1;
1151	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	else
1152	}	1097	w.stop ();
1153	}	1098	}
1154	#endif	1099	#endif
1155		1100
1156	#ifdef SELECTION_SCROLLING	1101	#ifdef SELECTION_SCROLLING
1157	void	1102	void
1158	rxvt_term::sel_scroll_cb (time_watcher &w)	1103	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159	{	1104	{
1160	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1105	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161	{	1106	{
1162	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1107	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163	want_refresh = 1;	1108	want_refresh = 1;
1164	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1165	}	1109	}
		1110	else
		1111	w.stop ();
1166	}	1112	}
1167	#endif	1113	#endif
1168		1114
1169	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1115	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170	void	1116	void
1171	rxvt_term::slip_wheel_cb (time_watcher &w)	1117	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172	{	1118	{
1173	if (mouse_slip_wheel_speed == 0	1119	if (mouse_slip_wheel_speed == 0
1174	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1120	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175	: scr_page (UP, mouse_slip_wheel_speed))	1121	: scr_page (UP, mouse_slip_wheel_speed))
1176	{	1122	{
1177	if (view_start == top_row \|\| view_start == 0)	1123	if (view_start == top_row \|\| view_start == 0)
1178	mouse_slip_wheel_speed = 0;	1124	mouse_slip_wheel_speed = 0;
1179		1125
1180	want_refresh = 1;	1126	want_refresh = 1;
1181	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1182	}	1127	}
		1128	else
		1129	w.stop ();
1183	}	1130	}
1184	#endif	1131	#endif
1185		1132
1186	#if LINUX_YIELD_HACK	1133	#if LINUX_YIELD_HACK
1187	static struct event_handler	1134	static struct event_handler
1188	{	1135	{
1189	check_watcher yield_ev;	1136	ev::prepare yield_ev;
1190		1137
1191	void yield_cb (check_watcher &w)	1138	void yield_cb (ev::prepare &w, int revents)
1192	{	1139	{
1193	// this should really be sched_yield(), but the linux guys thought	1140	// this should really be sched_yield(), but the linux guys thought
1194	// that giving a process calling sched_yield () less cpu time than	1141	// that giving a process calling sched_yield () less cpu time than
1195	// ones with high nice levels is a useful thing to do. It surely is is	1142	// ones with high nice levels is a useful thing to do. It surely is is
1196	// allowed by the sus... as is returning ENOSYS.	1143	// allowed by the sus... as is returning ENOSYS.
…		…
1247		1194
1248	return false;	1195	return false;
1249	}	1196	}
1250		1197
1251	void	1198	void
1252	rxvt_term::pty_cb (io_watcher &w, short revents)	1199	rxvt_term::pty_cb (ev::io &w, int revents)
1253	{	1200	{
1254	make_current ();	1201	make_current ();
1255		1202
1256	if (revents & EVENT_READ)	1203	if (revents & ev::READ)
1257	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1258	while (pty_fill ())	1205	while (pty_fill ())
1259	if (cmd_parse ())	1206	if (cmd_parse ())
1260	break;	1207	break;
1261		1208
1262	if (revents & EVENT_WRITE)	1209	if (revents & ev::WRITE)
1263	pty_write ();	1210	pty_write ();
1264	}	1211	}
1265		1212
1266	void	1213	void
1267	rxvt_term::pointer_unblank ()	1214	rxvt_term::pointer_unblank ()
…		…
1271		1218
1272	#ifdef POINTER_BLANK	1219	#ifdef POINTER_BLANK
1273	hidden_pointer = 0;	1220	hidden_pointer = 0;
1274		1221
1275	if (option (Opt_pointerBlank))	1222	if (option (Opt_pointerBlank))
1276	pointer_ev.start (NOW + pointerBlankDelay);	1223	pointer_ev.start (pointerBlankDelay);
1277	#endif	1224	#endif
1278	}	1225	}
1279		1226
1280	#ifdef POINTER_BLANK	1227	#ifdef POINTER_BLANK
1281	void	1228	void
…		…
1289		1236
1290	hidden_pointer = 1;	1237	hidden_pointer = 1;
1291	}	1238	}
1292		1239
1293	void	1240	void
1294	rxvt_term::pointer_cb (time_watcher &w)	1241	rxvt_term::pointer_cb (ev::timer &w, int revents)
1295	{	1242	{
1296	make_current ();	1243	make_current ();
1297		1244
1298	pointer_blank ();	1245	pointer_blank ();
1299	}	1246	}
…		…
1302	void	1249	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1250	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1251	{
1305	int button_number, key_state = 0;	1252	int button_number, key_state = 0;
1306	int x, y;	1253	int x, y;
		1254	int code = 32;
1307		1255
1308	x = ev.x;	1256	x = Pixel2Col (ev.x);
1309	y = ev.y;	1257	y = Pixel2Row (ev.y);
1310	pixel_position (&x, &y);	1258	if (ev.type == MotionNotify)
		1259	{
		1260	if (x == mouse_row && y == mouse_col)
		1261	return;
		1262	mouse_row = x;
		1263	mouse_col = y;
		1264	code += 32;
		1265	}
1311		1266
1312	if (MEvent.button == AnyButton)	1267	if (MEvent.button == AnyButton)
1313	button_number = 3;	1268	button_number = 3;
1314	else	1269	else
1315	{	1270	{
…		…
1361	x + 1,	1316	x + 1,
1362	y + 1);	1317	y + 1);
1363	#endif	1318	#endif
1364		1319
1365	tt_printf ("\033[M%c%c%c",	1320	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1321	(code + button_number + key_state),
1367	(32 + x + 1),	1322	(32 + x + 1),
1368	(32 + y + 1));	1323	(32 + y + 1));
1369	}	1324	}
1370		1325
1371	/{{{ process an X event /	1326	/{{{ process an X event /
…		…
1433	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1388	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434	focus_out ();	1389	focus_out ();
1435	}	1390	}
1436	#endif	1391	#endif
1437	}	1392	}
1438	break;
1439
1440	case MappingNotify:
1441	XRefreshKeyboardMapping (&ev.xmapping);
1442	break;	1393	break;
1443		1394
1444	/*	1395	/*
1445	* XXX: this is not the _current_ arrangement	1396	* XXX: this is not the _current_ arrangement
1446	* Here's my conclusion:	1397	* Here's my conclusion:
…		…
1479	&& ev.xfocus.mode != NotifyGrab)	1430	&& ev.xfocus.mode != NotifyGrab)
1480	focus_out ();	1431	focus_out ();
1481	break;	1432	break;
1482		1433
1483	case ConfigureNotify:	1434	case ConfigureNotify:
		1435	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1436	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1437	szHint.width, szHint.height); */
1484	if (ev.xconfigure.window == parent[0])	1438	if (ev.xconfigure.window == parent[0])
1485	{	1439	{
1486	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1440	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487	;	1441	;
1488		1442
1489	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1443	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1490	{	1444	{
1491	seen_resize = 1;	1445	seen_resize = 1;
1492	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1446	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493	#ifdef XPM_BACKGROUND
1494	if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495	{
1496	resize_pixmap ();
1497	scr_touch (true);
1498	}
1499	#endif
1500	}	1447	}
1501		1448	else
		1449	{
		1450	#ifdef HAVE_BG_PIXMAP
		1451	if (bgPixmap.window_position_sensitive ())
		1452	update_background ();
		1453	#endif
		1454	}
1502	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1455	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504	#ifdef ENABLE_TRANSPARENCY
1505	if (option (Opt_transparent))
1506	check_our_parents ();
1507	#endif
1508	}	1456	}
1509	break;	1457	break;
1510		1458
1511	case PropertyNotify:	1459	case PropertyNotify:
1512	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1460	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1530	break;	1478	break;
1531		1479
1532	case MapNotify:	1480	case MapNotify:
1533	mapped = 1;	1481	mapped = 1;
1534	#ifdef TEXT_BLINK	1482	#ifdef TEXT_BLINK
1535	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1483	text_blink_ev.start ();
1536	#endif	1484	#endif
1537	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1485	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538	break;	1486	break;
1539		1487
1540	case UnmapNotify:	1488	case UnmapNotify:
…		…
1542	#ifdef TEXT_BLINK	1490	#ifdef TEXT_BLINK
1543	text_blink_ev.stop ();	1491	text_blink_ev.stop ();
1544	#endif	1492	#endif
1545	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1493	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546	break;	1494	break;
1547
1548	#ifdef ENABLE_TRANSPARENCY
1549	case ReparentNotify:
1550	rootwin_cb (ev);
1551	break;
1552	#endif /* ENABLE_TRANSPARENCY */
1553		1495
1554	case GraphicsExpose:	1496	case GraphicsExpose:
1555	case Expose:	1497	case Expose:
1556	if (ev.xany.window == vt)	1498	if (ev.xany.window == vt)
1557	{	1499	{
1558	do	1500	do
		1501	{
1559	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1560	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
		1504	}
1561	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1505	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562		1506
1563	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1507	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564		1508
1565	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1509	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1510	{
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
1568		1513	}
1569	want_refresh = 1;	1514	want_refresh = 1;
1570	}	1515	}
1571	else	1516	else
1572	{	1517	{
1573	XEvent unused_event;	1518	XEvent unused_event;
…		…
1580	if (isScrollbarWindow (ev.xany.window))	1525	if (isScrollbarWindow (ev.xany.window))
1581	{	1526	{
1582	scrollBar.setIdle ();	1527	scrollBar.setIdle ();
1583	scrollbar_show (0);	1528	scrollbar_show (0);
1584	}	1529	}
1585
1586	#ifdef ENABLE_TRANSPARENCY
1587	if (am_transparent && ev.xany.window == parent[0])
1588	XClearWindow (dpy, ev.xany.window);
1589	#endif
1590	}	1530	}
1591	break;	1531	break;
1592		1532
1593	case MotionNotify:	1533	case MotionNotify:
1594	#ifdef POINTER_BLANK	1534	#ifdef POINTER_BLANK
1595	if (hidden_pointer)	1535	if (hidden_pointer)
1596	pointer_unblank ();	1536	pointer_unblank ();
1597	#endif	1537	#endif
		1538	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1539	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1540	mouse_report (ev.xbutton);
1598	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599	break;	1542	break;
1600		1543
1601	if (ev.xany.window == vt)	1544	if (ev.xany.window == vt)
1602	{	1545	{
…		…
1636	int dist;	1579	int dist;
1637		1580
1638	/* don't clobber the current delay if we are	1581	/* don't clobber the current delay if we are
1639	* already in the middle of scrolling.	1582	* already in the middle of scrolling.
1640	*/	1583	*/
1641	if (!sel_scroll_ev.active)	1584	if (!ev_is_active (&sel_scroll_ev))
1642	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1585	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643		1586
1644	/* save the event params so we can highlight	1587	/* save the event params so we can highlight
1645	* the selection in the pending-scroll loop	1588	* the selection in the pending-scroll loop
1646	*/	1589	*/
1647	selection_save_x = ev.xbutton.x;	1590	selection_save_x = ev.xbutton.x;
…		…
1669	else	1612	else
1670	{	1613	{
1671	/* we are within the text window, so we	1614	/* we are within the text window, so we
1672	* shouldn't be scrolling	1615	* shouldn't be scrolling
1673	*/	1616	*/
1674	if (sel_scroll_ev.active)	1617	if (ev_is_active (&sel_scroll_ev))
1675	sel_scroll_ev.stop();	1618	sel_scroll_ev.stop();
1676	}	1619	}
1677	#endif	1620	#endif
1678	#ifdef MOUSE_THRESHOLD	1621	#ifdef MOUSE_THRESHOLD
1679	}	1622	}
…		…
1706	{	1649	{
1707	hidden_cursor = 0;	1650	hidden_cursor = 0;
1708	want_refresh = 1;	1651	want_refresh = 1;
1709	}	1652	}
1710		1653
1711	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1654	cursor_blink_ev.again ();
1712	}	1655	}
1713	#endif	1656	#endif
1714		1657
1715	#if defined(POINTER_BLANK)	1658	#if defined(POINTER_BLANK)
1716	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1659	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1744	XSetICFocus (Input_Context);	1687	XSetICFocus (Input_Context);
1745	}	1688	}
1746	#endif	1689	#endif
1747	#if CURSOR_BLINK	1690	#if CURSOR_BLINK
1748	if (option (Opt_cursorBlink))	1691	if (option (Opt_cursorBlink))
1749	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1692	cursor_blink_ev.again ();
1750	#endif	1693	#endif
1751	#if OFF_FOCUS_FADING	1694	#if OFF_FOCUS_FADING
1752	if (rs[Rs_fade])	1695	if (rs[Rs_fade])
1753	{	1696	{
1754	pix_colors = pix_colors_focused;	1697	pix_colors = pix_colors_focused;
…		…
1756	}	1699	}
1757	#endif	1700	#endif
1758	#if ENABLE_FRILLS	1701	#if ENABLE_FRILLS
1759	if (option (Opt_urgentOnBell))	1702	if (option (Opt_urgentOnBell))
1760	{	1703	{
1761	XWMHints *h;
1762
1763	h = XGetWMHints(dpy, parent[0]);	1704	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1764	if (h != NULL)
1765	{	1705	{
1766	h->flags &= ~XUrgencyHint;	1706	h->flags &= ~XUrgencyHint;
1767	XSetWMHints(dpy, parent[0], h);	1707	XSetWMHints (dpy, parent[0], h);
1768	}	1708	}
1769	}	1709	}
1770	#endif	1710	#endif
1771	}	1711	}
1772	}	1712	}
…		…
1783		1723
1784	#if ENABLE_FRILLS \|\| ISO_14755	1724	#if ENABLE_FRILLS \|\| ISO_14755
1785	if (iso14755buf)	1725	if (iso14755buf)
1786	{	1726	{
1787	iso14755buf = 0;	1727	iso14755buf = 0;
1788	# if ENABLE_OVERLAY	1728	# if ISO_14755
1789	scr_overlay_off ();	1729	scr_overlay_off ();
1790	# endif	1730	# endif
1791	}	1731	}
1792	#endif	1732	#endif
1793	#if USE_XIM	1733	#if USE_XIM
…		…
1795	XUnsetICFocus (Input_Context);	1735	XUnsetICFocus (Input_Context);
1796	#endif	1736	#endif
1797	#if CURSOR_BLINK	1737	#if CURSOR_BLINK
1798	if (option (Opt_cursorBlink))	1738	if (option (Opt_cursorBlink))
1799	cursor_blink_ev.stop ();	1739	cursor_blink_ev.stop ();
		1740
1800	hidden_cursor = 0;	1741	hidden_cursor = 0;
1801	#endif	1742	#endif
1802	#if OFF_FOCUS_FADING	1743	#if OFF_FOCUS_FADING
1803	if (rs[Rs_fade])	1744	if (rs[Rs_fade])
1804	{	1745	{
…		…
1838	case PropertyNotify:	1779	case PropertyNotify:
1839	/*	1780	/*
1840	* if user used some Esetroot compatible prog to set the root bg,	1781	* if user used some Esetroot compatible prog to set the root bg,
1841	* use the property to determine the pixmap. We use it later on.	1782	* use the property to determine the pixmap. We use it later on.
1842	*/	1783	*/
1843	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1784	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1785	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845	return;	1786	{
1846		1787	bgPixmap.set_root_pixmap ();
1847	/* FALLTHROUGH */	1788	update_background ();
1848	case ReparentNotify:	1789	}
1849	if (option (Opt_transparent))
1850	check_our_parents ();
1851	break;	1790	break;
1852	}	1791	}
1853	# endif	1792	# endif
1854	}	1793	}
1855	#endif	1794	#endif
…		…
1913	mouse_report (ev);	1852	mouse_report (ev);
1914	}	1853	}
1915	#else	1854	#else
1916	MEvent.button = ev.button;	1855	MEvent.button = ev.button;
1917	mouse_report (ev);	1856	mouse_report (ev);
1918	#endif /* MOUSE_REPORT_DOUBLECLICK */	1857	#endif /* MOUSE_REPORT_DOUBLECLICK */
1919		1858
1920	}	1859	}
1921	else	1860	else
1922	{	1861	{
1923	if (ev.button != MEvent.button)	1862	if (ev.button != MEvent.button)
…		…
2017	tt_printf ("\033[5~");	1956	tt_printf ("\033[5~");
2018	break;	1957	break;
2019	}	1958	}
2020	}	1959	}
2021	else	1960	else
2022	#endif /* NO_SCROLLBAR_REPORT */	1961	#endif /* NO_SCROLLBAR_REPORT */
2023		1962
2024	{	1963	{
2025	char upordown = 0;	1964	char upordown = 0;
2026		1965
2027	if (scrollBar.style == R_SB_NEXT)	1966	if (scrollBar.style == R_SB_NEXT)
2028	{	1967	{
2029	if (scrollbarnext_upButton (ev.y))	1968	if (scrollbarnext_upButton (ev.y))
2030	upordown = -1; /* up */	1969	upordown = -1; /* up */
…		…
2039	upordown = 1; /* down */	1978	upordown = 1; /* down */
2040	}	1979	}
2041	if (upordown)	1980	if (upordown)
2042	{	1981	{
2043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1982	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2044	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1983	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045	#endif	1984	#endif
2046	if (scr_page (upordown < 0 ? UP : DN, 1))	1985	if (scr_page (upordown < 0 ? UP : DN, 1))
2047	{	1986	{
2048	if (upordown < 0)	1987	if (upordown < 0)
2049	scrollBar.setUp ();	1988	scrollBar.setUp ();
…		…
2129	scrollBar.setIdle ();	2068	scrollBar.setIdle ();
2130	scrollbar_show (0);	2069	scrollbar_show (0);
2131	}	2070	}
2132		2071
2133	#ifdef SELECTION_SCROLLING	2072	#ifdef SELECTION_SCROLLING
2134	if (sel_scroll_ev.active)	2073	if (ev_is_active (&sel_scroll_ev))
2135	sel_scroll_ev.stop();	2074	sel_scroll_ev.stop();
2136	#endif	2075	#endif
2137		2076
2138	if (ev.window == vt)	2077	if (ev.window == vt)
2139	{	2078	{
…		…
2164	mouse_report (ev);	2103	mouse_report (ev);
2165	}	2104	}
2166	#else /* MOUSE_REPORT_DOUBLECLICK */	2105	#else /* MOUSE_REPORT_DOUBLECLICK */
2167	MEvent.button = AnyButton;	2106	MEvent.button = AnyButton;
2168	mouse_report (ev);	2107	mouse_report (ev);
2169	#endif /* MOUSE_REPORT_DOUBLECLICK */	2108	#endif /* MOUSE_REPORT_DOUBLECLICK */
2170	return;	2109	return;
2171	}	2110	}
2172		2111
2173	/*	2112	/*
2174	* dumb hack to compensate for the failure of click-and-drag	2113	* dumb hack to compensate for the failure of click-and-drag
…		…
2212	{	2151	{
2213	mouse_slip_wheel_speed += v ? -1 : 1;	2152	mouse_slip_wheel_speed += v ? -1 : 1;
2214	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2153	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2154	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216		2155
2217	if (slip_wheel_ev.at < NOW)	2156	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2219
2220	slip_wheel_ev.start ();
2221	}	2157	}
2222	else	2158	else
2223	{	2159	{
2224	# endif	2160	# endif
2225	scr_page (v, i);	2161	scr_page (v, i);
…		…
2293		2229
2294	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2230	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2295	{	2231	{
2296	refresh_count = 0;	2232	refresh_count = 0;
2297		2233
2298	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2234	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2299	{	2235	{
2300	refreshnow = true;	2236	refreshnow = true;
2301	ch = NOCHAR;	2237	ch = NOCHAR;
2302	break;	2238	break;
2303	}	2239	}
…		…
2514	}	2450	}
2515	}	2451	}
2516		2452
2517	pclose_printer (fd);	2453	pclose_printer (fd);
2518	}	2454	}
2519	#endif /* PRINTPIPE */	2455	#endif /* PRINTPIPE */
2520	/}}} /	2456	/}}} /
2521		2457
2522	/* INDENT-OFF */	2458	/* INDENT-OFF */
2523	enum {	2459	enum {
2524	C1_40 = 0x40,	2460	C1_40 = 0x40,
…		…
2810	rxvt_term::process_csi_seq ()	2746	rxvt_term::process_csi_seq ()
2811	{	2747	{
2812	unicode_t ch, priv, i;	2748	unicode_t ch, priv, i;
2813	unsigned int nargs, p;	2749	unsigned int nargs, p;
2814	int n, ndef;	2750	int n, ndef;
2815	int arg[ESC_ARGS];	2751	int arg[ESC_ARGS] = { };
2816		2752
2817	memset (arg, 0, sizeof (arg));
2818	nargs = 0;	2753	nargs = 0;
2819		2754
2820	priv = 0;	2755	priv = 0;
2821	ch = cmd_getc ();	2756	ch = cmd_getc ();
2822	if (ch >= '<' && ch <= '?')	2757	if (ch >= '<' && ch <= '?')
		2758	{
2823	{ /* '<' '=' '>' '?' */	2759	/* '<' '=' '>' '?' */
2824	priv = ch;	2760	priv = ch;
2825	ch = cmd_getc ();	2761	ch = cmd_getc ();
2826	}	2762	}
2827		2763
2828	/* read any numerical arguments */	2764	/* read any numerical arguments */
…		…
2871	{	2807	{
2872	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2808	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2809	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874	//	2810	//
2875	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2811	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2812	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877	// that we do not support xterm mouse reporting (should be 95 when we do).	2813	// versions.
2878	//	2814	//
2879	tt_printf ("\033[>%d;94;0c", 'U');	2815	tt_printf ("\033[>%d;95;0c", 'U');
2880	}	2816	}
2881	break;	2817	break;
2882	case '?':	2818	case '?':
2883	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2819	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2884	process_terminal_mode (ch, priv, nargs, arg);	2820	process_terminal_mode (ch, priv, nargs, arg);
…		…
3435	break;	3371	break;
3436	case URxvt_Color_IT:	3372	case URxvt_Color_IT:
3437	process_color_seq (op, Color_IT, str, resp);	3373	process_color_seq (op, Color_IT, str, resp);
3438	break;	3374	break;
3439	#endif	3375	#endif
3440	#if ENABLE_TRANSPARENCY && TINTING	3376	#if ENABLE_TRANSPARENCY
3441	case URxvt_Color_tint:	3377	case URxvt_Color_tint:
3442	process_color_seq (op, Color_tint, str, resp);	3378	process_color_seq (op, Color_tint, str, resp);
		3379	{
		3380	bool changed = false;
		3381	if (ISSET_PIXCOLOR (Color_tint))
		3382	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3383	else
		3384	changed = bgPixmap.unset_tint ();
		3385	if (changed)
		3386	update_background ();
		3387	}
3443		3388
3444	check_our_parents ();
3445
3446	if (am_transparent)
3447	want_full_refresh = want_refresh = 1;
3448
3449	break;	3389	break;
3450	#endif	3390	#endif
3451		3391
		3392	#if BG_IMAGE_FROM_FILE
3452	case Rxvt_Pixmap:	3393	case Rxvt_Pixmap:
3453	{	3394	if (!strcmp (str, "?"))
3454	if (*str != ';')
3455	{	3395	{
3456	#if XPM_BACKGROUND	3396	char str[256];
3457	scale_pixmap (""); /* reset to default scaling */	3397
3458	set_bgPixmap (str); /* change pixmap */	3398	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3459	scr_touch (true);	3399	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460	#endif	3400	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3401	process_xterm_seq (XTerm_title, str, CHAR_ST);
3461	}	3402	}
3462		3403	else
		3404	{
3463	int changed = 0;	3405	int changed = 0;
3464		3406
3465	while ((str = strchr (str, ';')) != NULL)	3407	if (*str != ';')
3466	{	3408	{
		3409	/* reset to default scaling :*/
		3410	bgPixmap.unset_geometry ();
		3411	if (bgPixmap.set_file (str)) /* change pixmap */
		3412	changed++;
		3413	str = strchr (str, ';');
		3414	if (str == NULL)
		3415	bgPixmap.set_defaultGeometry ();
		3416	}
		3417	while (str)
		3418	{
3467	str++;	3419	str++;
3468	#if XPM_BACKGROUND	3420	if (bgPixmap.set_geometry (str))
3469	changed += scale_pixmap (str);	3421	changed++;
3470	#endif	3422	str = strchr (str, ';');
3471	}	3423	}
3472
3473	if (changed)	3424	if (changed)
3474	{	3425	update_background ();
3475	#ifdef XPM_BACKGROUND
3476	resize_pixmap ();
3477	scr_touch (true);
3478	#endif
3479	}	3426	}
3480	#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481	if (option (Opt_transparent))
3482	check_our_parents ();
3483	#endif
3484	}
3485	break;	3427	break;
		3428	#endif
3486		3429
3487	case Rxvt_restoreFG:	3430	case Rxvt_restoreFG:
3488	set_window_color (Color_fg, str);	3431	set_window_color (Color_fg, str);
3489	break;	3432	break;
3490	case Rxvt_restoreBG:	3433	case Rxvt_restoreBG:
…		…
3612	{	3555	{
3613	unsigned int i, j;	3556	unsigned int i, j;
3614	int state;	3557	int state;
3615		3558
3616	static const struct	3559	static const struct
3617	{	3560	{
3618	const int argval;	3561	const int argval;
3619	const unsigned long bit;	3562	const unsigned long bit;
3620	}
3621
3622	argtopriv[] = {	3563	} argtopriv[] = {
3623	{ 1, PrivMode_aplCUR },	3564	{ 1, PrivMode_aplCUR },
3624	{ 2, PrivMode_vt52 },	3565	{ 2, PrivMode_vt52 },
3625	{ 3, PrivMode_132 },	3566	{ 3, PrivMode_132 },
3626	{ 4, PrivMode_smoothScroll },	3567	{ 4, PrivMode_smoothScroll },
3627	{ 5, PrivMode_rVideo },	3568	{ 5, PrivMode_rVideo },
…		…
3643	{ 66, PrivMode_aplKP },	3584	{ 66, PrivMode_aplKP },
3644	#ifndef NO_BACKSPACE_KEY	3585	#ifndef NO_BACKSPACE_KEY
3645	{ 67, PrivMode_BackSpace },	3586	{ 67, PrivMode_BackSpace },
3646	#endif	3587	#endif
3647	{ 1000, PrivMode_MouseX11 },	3588	{ 1000, PrivMode_MouseX11 },
3648	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3589	{ 1002, PrivMode_MouseBtnEvent },
3649	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3590	{ 1003, PrivMode_MouseAnyEvent },
3650	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3651	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3591	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652	{ 1011, PrivMode_Keypress }, // rxvt extension	3592	{ 1011, PrivMode_Keypress }, // rxvt extension
3653	// 1035 enable modifiers for alt, numlock NYI	3593	// 1035 enable modifiers for alt, numlock NYI
3654	// 1036 send ESC for meta keys NYI	3594	// 1036 send ESC for meta keys NYI
3655	// 1037 send DEL for keypad delete NYI	3595	// 1037 send DEL for keypad delete NYI
…		…
3729	scr_autowrap (state);	3669	scr_autowrap (state);
3730	break;	3670	break;
3731	/* case 8: - auto repeat, can't do on a per window basis */	3671	/* case 8: - auto repeat, can't do on a per window basis */
3732	case 9: /* X10 mouse reporting */	3672	case 9: /* X10 mouse reporting */
3733	if (state) /* orthogonal */	3673	if (state) /* orthogonal */
3734	priv_modes &= ~PrivMode_MouseX11;	3674	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3735	break;	3675	break;
3736	#ifdef scrollBar_esc	3676	#ifdef scrollBar_esc
3737	case scrollBar_esc:	3677	case scrollBar_esc:
3738	if (scrollbar_mapping (state))	3678	if (scrollbar_mapping (state))
3739	{	3679	{
…		…
3752	break;	3692	break;
3753	/* case 66: - application key pad */	3693	/* case 66: - application key pad */
3754	/* case 67: - backspace key */	3694	/* case 67: - backspace key */
3755	case 1000: /* X11 mouse reporting */	3695	case 1000: /* X11 mouse reporting */
3756	if (state) /* orthogonal */	3696	if (state) /* orthogonal */
3757	priv_modes &= ~PrivMode_MouseX10;	3697	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3758	break;	3698	break;
3759	#if 0
3760	case 1001:	3699	case 1002:
3761	break; /* X11 mouse highlighting */	3700	case 1003:
3762	#endif	3701	if (state)
		3702	{
		3703	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3704	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3705	vt_emask_mouse = PointerMotionMask;
		3706	}
		3707	else
		3708	vt_emask_mouse = NoEventMask;
		3709	vt_select_input ();
		3710	break;
3763	case 1010: /* scroll to bottom on TTY output inhibit */	3711	case 1010: /* scroll to bottom on TTY output inhibit */
3764	set_option (Opt_scrollTtyOutput, !state);	3712	set_option (Opt_scrollTtyOutput, !state);
3765	break;	3713	break;
3766	case 1011: /* scroll to bottom on key press */	3714	case 1011: /* scroll to bottom on key press */
3767	set_option (Opt_scrollTtyKeypress, state);	3715	set_option (Opt_scrollTtyKeypress, state);
…		…
3944	rxvt_term::process_graphics ()	3892	rxvt_term::process_graphics ()
3945	{	3893	{
3946	unicode_t ch, cmd = cmd_getc ();	3894	unicode_t ch, cmd = cmd_getc ();
3947		3895
3948	if (cmd == 'Q')	3896	if (cmd == 'Q')
		3897	{
3949	{ /* query graphics */	3898	/* query graphics */
3950	tt_printf ("\033G0\012"); /* no graphics */	3899	tt_printf ("\033G0\012"); /* no graphics */
3951	return;	3900	return;
3952	}	3901	}
3953	/* swallow other graphics sequences until terminating ':' */	3902	/* swallow other graphics sequences until terminating ':' */
3954	do	3903	do
…		…
4004	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3953	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005		3954
4006	memcpy (v_buffer + v_buflen, data, len);	3955	memcpy (v_buffer + v_buflen, data, len);
4007	v_buflen += len;	3956	v_buflen += len;
4008		3957
4009	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3958	pty_ev.set (ev::READ \| ev::WRITE);
4010	}	3959	}
4011		3960
4012	void rxvt_term::pty_write ()	3961	void rxvt_term::pty_write ()
4013	{	3962	{
4014	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3963	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4019		3968
4020	if (v_buflen == 0)	3969	if (v_buflen == 0)
4021	{	3970	{
4022	free (v_buffer);	3971	free (v_buffer);
4023	v_buffer = 0;	3972	v_buffer = 0;
4024	v_buflen = 0;
4025		3973
4026	pty_ev.set (EVENT_READ);	3974	pty_ev.set (ev::READ);
4027	return;	3975	return;
4028	}	3976	}
4029		3977
4030	memmove (v_buffer, v_buffer + written, v_buflen);	3978	memmove (v_buffer, v_buffer + written, v_buflen);
4031	}	3979	}
4032	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3980	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4033	pty_ev.set (EVENT_READ);	3981	pty_ev.set (ev::READ);
4034	}	3982	}
4035		3983
4036	/----------------------- end-of-file (C source) -----------------------/	3984	/----------------------- end-of-file (C source) -----------------------/
4037		3985

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.335 by ayin, Tue Jun 26 15:17:24 2007 UTC vs. Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.335 by ayin, Tue Jun 26 15:17:24 2007 UTC vs.
Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC