summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/events/event_x.cc24
-rw-r--r--views/focus/accelerator_handler.h2
-rw-r--r--views/focus/accelerator_handler_touch.cc20
-rw-r--r--views/touchui/touch_factory.cc4
-rw-r--r--views/views.gyp24
-rw-r--r--views/widget/native_widget_gtk.cc13
6 files changed, 5 insertions, 82 deletions
diff --git a/views/events/event_x.cc b/views/events/event_x.cc
index 23c0690..dc88121 100644
--- a/views/events/event_x.cc
+++ b/views/events/event_x.cc
@@ -6,19 +6,14 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
-#if defined(HAVE_XINPUT2)
#include <X11/extensions/XInput2.h>
-#endif
#include <X11/Xlib.h>
#include "base/logging.h"
#include "base/utf_string_conversions.h"
#include "ui/base/keycodes/keyboard_code_conversion_x.h"
-#include "views/widget/root_view.h"
-
-#if defined(HAVE_XINPUT2)
#include "views/touchui/touch_factory.h"
-#endif
+#include "views/widget/root_view.h"
namespace views {
@@ -69,7 +64,6 @@ int GetEventFlagsForButton(int button) {
return 0;
}
-#if defined(HAVE_XINPUT2)
int GetButtonMaskForX2Event(XIDeviceEvent* xievent) {
int buttonflags = 0;
@@ -121,8 +115,6 @@ int GetTouchIDFromXEvent(XEvent* xev) {
return slot;
}
-#endif // HAVE_XINPUT2
-
ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
switch (native_event->type) {
case KeyPress:
@@ -144,7 +136,6 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
(Button1Mask | Button2Mask | Button3Mask))
return ui::ET_MOUSE_DRAGGED;
return ui::ET_MOUSE_MOVED;
-#if defined(HAVE_XINPUT2)
case GenericEvent: {
XIDeviceEvent* xievent =
static_cast<XIDeviceEvent*>(native_event->xcookie.data);
@@ -162,7 +153,6 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
ui::ET_MOUSE_MOVED;
}
}
-#endif
default:
NOTREACHED();
break;
@@ -171,12 +161,10 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
}
int GetMouseWheelOffset(XEvent* xev) {
-#if defined(HAVE_XINPUT2)
if (xev->type == GenericEvent) {
XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
return xiev->detail == 4 ? kWheelScrollAmount : -kWheelScrollAmount;
}
-#endif
return xev->xbutton.button == 4 ? kWheelScrollAmount : -kWheelScrollAmount;
}
@@ -189,14 +177,12 @@ gfx::Point GetEventLocation(XEvent* xev) {
case MotionNotify:
return gfx::Point(xev->xmotion.x, xev->xmotion.y);
-#if defined(HAVE_XINPUT2)
case GenericEvent: {
XIDeviceEvent* xievent =
static_cast<XIDeviceEvent*>(xev->xcookie.data);
return gfx::Point(static_cast<int>(xievent->event_x),
static_cast<int>(xievent->event_y));
}
-#endif
}
return gfx::Point();
@@ -212,7 +198,6 @@ int GetLocatedEventFlags(XEvent* xev) {
case MotionNotify:
return GetEventFlagsFromXState(xev->xmotion.state);
-#if defined(HAVE_XINPUT2)
case GenericEvent: {
XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev->xcookie.data);
bool touch =
@@ -229,7 +214,6 @@ int GetLocatedEventFlags(XEvent* xev) {
GetEventFlagsFromXState(xievent->mods.effective);
}
}
-#endif
}
return 0;
@@ -245,18 +229,15 @@ uint16 GetCharacterFromXKeyEvent(XKeyEvent* key) {
result.length() == 1) ? result[0] : 0;
}
-#if defined(HAVE_XINPUT2)
float GetTouchParamFromXEvent(XEvent* xev,
TouchFactory::TouchParam tp,
float default_value) {
TouchFactory::GetInstance()->ExtractTouchParam(*xev, tp, &default_value);
return default_value;
}
-#endif
float GetTouchForceFromXEvent(XEvent* xev) {
float force = 0.0;
-#if defined(HAVE_XINPUT2)
force = GetTouchParamFromXEvent(xev, TouchFactory::TP_PRESSURE, 0.0);
unsigned int deviceid =
static_cast<XIDeviceEvent*>(xev->xcookie.data)->sourceid;
@@ -264,7 +245,6 @@ float GetTouchForceFromXEvent(XEvent* xev) {
if (!TouchFactory::GetInstance()->NormalizeTouchParam(
deviceid, TouchFactory::TP_PRESSURE, &force))
force = 0.0;
-#endif
return force;
}
@@ -401,7 +381,6 @@ MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
////////////////////////////////////////////////////////////////////////////////
// TouchEvent, public:
-#if defined(HAVE_XINPUT2)
TouchEvent::TouchEvent(NativeEvent2 native_event_2,
FromNativeEvent2 from_native)
: LocatedEvent(native_event_2, from_native),
@@ -425,6 +404,5 @@ TouchEvent::TouchEvent(NativeEvent2 native_event_2,
}
}
}
-#endif
} // namespace views
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index 44b411f..630c011 100644
--- a/views/focus/accelerator_handler.h
+++ b/views/focus/accelerator_handler.h
@@ -24,11 +24,9 @@ namespace views {
// and handled, false otherwise.
bool DispatchXEvent(XEvent* xevent);
-#if defined(HAVE_XINPUT2)
// Keep a list of touch devices so that it is possible to determine if a pointer
// event is a touch-event or a mouse-event.
void SetTouchDeviceList(std::vector<unsigned int>& devices);
-#endif // HAVE_XINPUT2
#endif // TOUCH_UI
// This class delegates the key messages to the associated FocusManager class
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index f5ccd31..c76e8ba 100644
--- a/views/focus/accelerator_handler_touch.cc
+++ b/views/focus/accelerator_handler_touch.cc
@@ -6,11 +6,7 @@
#include <bitset>
#include <gtk/gtk.h>
-#if defined(HAVE_XINPUT2)
#include <X11/extensions/XInput2.h>
-#else
-#include <X11/Xlib.h>
-#endif
#include "views/accelerator.h"
#include "views/events/event.h"
@@ -43,7 +39,6 @@ Widget* FindWidgetForGdkWindow(GdkWindow* gdk_window) {
} // namespace
-#if defined(HAVE_XINPUT2)
bool DispatchX2Event(Widget* widget, XEvent* xev) {
XGenericEventCookie* cookie = &xev->xcookie;
switch (cookie->evtype) {
@@ -106,13 +101,10 @@ bool DispatchX2Event(Widget* widget, XEvent* xev) {
return false;
}
-#endif // HAVE_XINPUT2
-
bool DispatchXEvent(XEvent* xev) {
GdkDisplay* gdisp = gdk_display_get_default();
XID xwindow = xev->xany.window;
-#if defined(HAVE_XINPUT2)
if (xev->type == GenericEvent) {
if (!TouchFactory::GetInstance()->ShouldProcessXI2Event(xev))
return true; // Consume the event.
@@ -126,7 +118,6 @@ bool DispatchXEvent(XEvent* xev) {
XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(cookie->data);
xwindow = xiev->event;
}
-#endif
GdkWindow* gwind = gdk_window_lookup_for_display(gdisp, xwindow);
Widget* widget = FindWidgetForGdkWindow(gwind);
@@ -158,37 +149,26 @@ bool DispatchXEvent(XEvent* xev) {
return widget->OnMouseEvent(mouseev);
}
-#if defined(HAVE_XINPUT2)
case GenericEvent: {
return DispatchX2Event(widget, xev);
}
-#endif
}
}
return false;
}
-#if defined(HAVE_XINPUT2)
void SetTouchDeviceList(std::vector<unsigned int>& devices) {
TouchFactory::GetInstance()->SetTouchDeviceList(devices);
}
-#endif
AcceleratorHandler::AcceleratorHandler() {}
-#if defined(TOUCH_UI)
base::MessagePumpDispatcher::DispatchStatus
AcceleratorHandler::Dispatch(XEvent* xev) {
return DispatchXEvent(xev) ?
base::MessagePumpDispatcher::EVENT_PROCESSED :
base::MessagePumpDispatcher::EVENT_IGNORED;
}
-#else
-bool AcceleratorHandler::Dispatch(GdkEvent* event) {
- gtk_main_do_event(event);
- return true;
-}
-#endif
} // namespace views
diff --git a/views/touchui/touch_factory.cc b/views/touchui/touch_factory.cc
index eedc365..2f3506f 100644
--- a/views/touchui/touch_factory.cc
+++ b/views/touchui/touch_factory.cc
@@ -4,8 +4,6 @@
#include "views/touchui/touch_factory.h"
-#if defined(HAVE_XINPUT2)
-
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <X11/cursorfont.h>
@@ -421,5 +419,3 @@ bool TouchFactory::GetTouchParamRange(unsigned int deviceid,
}
} // namespace views
-
-#endif // defined(HAVE_XINPUT2)
diff --git a/views/views.gyp b/views/views.gyp
index 92859ae..613f50f 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -7,21 +7,6 @@
'chromium_code': 1,
},
- 'conditions': [
- ['os_posix == 1 and OS != "mac"', {
- 'conditions': [
- ['sysroot!=""', {
- 'variables': {
- 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
- },
- }, {
- 'variables': {
- 'pkg-config': 'pkg-config'
- },
- }],]
- }],
- ],
-
'target_defaults': {
'conditions': [
['OS=="win"', {'sources/': [
@@ -419,15 +404,6 @@
['exclude', 'controls/menu/native_menu_gtk.cc'],
['exclude', 'widget/tooltip_manager_gtk.cc'],
],
- 'conditions': [
- ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!=""', {
- # Exclude TouchFactory if XInput2 is not available.
- 'sources/': [
- ['exclude', 'touchui/touch_factory.cc'],
- ['exclude', 'touchui/touch_factory.h'],
- ],
- }],
- ],
}],
['use_ibus==1', {
'dependencies': [
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index 77ad694..82ac4b33 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -43,12 +43,7 @@
#if defined(TOUCH_UI)
#include "views/widget/tooltip_manager_views.h"
-#if defined(HAVE_XINPUT2)
-#include <gdk/gdkx.h>
-
-#include "ui/gfx/gtk_util.h"
#include "views/touchui/touch_factory.h"
-#endif
#else
#include "views/widget/tooltip_manager_gtk.h"
#endif
@@ -379,7 +374,7 @@ NativeWidgetGtk::NativeWidgetGtk(internal::NativeWidgetDelegate* delegate)
painted_(false),
has_mouse_grab_(false),
has_keyboard_grab_(false) {
-#if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
// Make sure the touch factory is initialized so that it can setup XInput2 for
// the widget.
TouchFactory::GetInstance();
@@ -919,7 +914,7 @@ void NativeWidgetGtk::SetMouseCapture() {
DCHECK_EQ(GDK_GRAB_SUCCESS, pointer_grab_status);
has_mouse_grab_ = pointer_grab_status == GDK_GRAB_SUCCESS;
-#if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
::Window window = GDK_WINDOW_XID(window_contents()->window);
Display* display = GDK_WINDOW_XDISPLAY(window_contents()->window);
bool xi2grab = TouchFactory::GetInstance()->GrabTouchDevices(display, window);
@@ -934,7 +929,7 @@ void NativeWidgetGtk::ReleaseMouseCapture() {
has_mouse_grab_ = false;
gdk_pointer_ungrab(GDK_CURRENT_TIME);
gdk_keyboard_ungrab(GDK_CURRENT_TIME);
-#if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
TouchFactory::GetInstance()->UngrabTouchDevices(
GDK_WINDOW_XDISPLAY(window_contents()->window));
#endif
@@ -1307,7 +1302,7 @@ void NativeWidgetGtk::SchedulePaintInRect(const gfx::Rect& rect) {
}
void NativeWidgetGtk::SetCursor(gfx::NativeCursor cursor) {
-#if defined(TOUCH_UI) && defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
if (TouchFactory::GetInstance()->keep_mouse_cursor())
cursor = gfx::GetCursor(GDK_ARROW);
else if (!TouchFactory::GetInstance()->is_cursor_visible())
generated by cgit v1.1 at 2025-02-12 21:31:26 +0000