Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
events.c screen.c screen.h
Log Message:
Wed Feb 19 11:41:00 2003 Michael Jennings (mej)
Patch from Paul Brannan <[EMAIL PROTECTED]> to fix a conflict
between twin's non-standard mouse drag reporting and vim when twin
support is not enabled.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/events.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- events.c 13 Oct 2002 05:03:46 -0000 1.56
+++ events.c 19 Feb 2003 16:42:26 -0000 1.57
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: events.c,v 1.56 2002/10/13 05:03:46 mej Exp $";
+static const char cvs_ident[] = "$Id: events.c,v 1.57 2003/02/19 16:42:26 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -805,10 +805,15 @@
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
+#ifdef HAVE_TWIN
+ /* It's really silly that Twin uses mouse drag codes that are
+ * different from the ones that xterm uses.
+ */
if ((PrivateModes & PrivMode_mouse_report) && !(button_state.bypass_keystate)) {
- mouse_drag_report(&(ev->xbutton));
+ twin_mouse_drag_report(&(ev->xbutton));
return 1;
}
+#endif
if (ev->xany.window == TermWin.vt) {
if (ev->xbutton.state & (Button1Mask | Button3Mask)) {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- screen.c 8 Oct 2002 02:18:08 -0000 1.69
+++ screen.c 19 Feb 2003 16:42:26 -0000 1.70
@@ -3,7 +3,7 @@
*
*/
-static const char cvs_ident[] = "$Id: screen.c,v 1.69 2002/10/08 02:18:08 mej Exp $";
+static const char cvs_ident[] = "$Id: screen.c,v 1.70 2003/02/19 16:42:26 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -3277,7 +3277,7 @@
}
void /* drag report as used by the "twin" program */
-mouse_drag_report(XButtonEvent * ev)
+twin_mouse_drag_report(XButtonEvent * ev)
{
int button_number, key_state, x = Pixel2Col(ev->x), y = Pixel2Row(ev->y);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- screen.h 8 Oct 2002 02:18:08 -0000 1.24
+++ screen.h 19 Feb 2003 16:42:27 -0000 1.25
@@ -302,7 +302,7 @@
extern void selection_rotate(int, int);
extern void selection_send(XSelectionRequestEvent *);
extern void mouse_report(XButtonEvent *);
-extern void mouse_drag_report(XButtonEvent *);
+extern void twin_mouse_drag_report(XButtonEvent *);
extern void mouse_tracking(int, int, int, int, int);
extern void debug_colors(void);
#ifdef MULTI_CHARSET
-------------------------------------------------------
This SF.net email is sponsored by: SlickEdit Inc. Develop an edge.
The most comprehensive and flexible code editor you can use.
Code faster. C/C++, C#, Java, HTML, XML, many more. FREE 30-Day Trial.
www.slickedit.com/sourceforge
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
