forstio
/
forstio-window
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using indices instead of iterators because of invalidations

dev
keldu.magnus 2021-01-09 00:07:44 +01:00
parent 354e54eb25
commit a43fa77dbe
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
driver/device_xcb.cpp
View File

@ -29,9 +29,8 @@ void XcbDevice::handleEvents() {
while (xcb_generic_event_t *event = xcb_poll_for_event(xcb_connection)) {
pending_events.push_back(event);
}
for (auto event_iter = pending_events.begin();
event_iter != pending_events.end(); ++event_iter) {
xcb_generic_event_t *event = *event_iter;
for (size_t i = 0; i < pending_events.size(); ++i) {
xcb_generic_event_t *event = pending_events.at(i);
switch (event->response_type & ~0x80) {
case XCB_EXPOSE: {
xcb_expose_event_t *expose =
@ -73,10 +72,8 @@ void XcbDevice::handleEvents() {
/*
* Peek into future events
*/
auto f_iter = event_iter;
++f_iter;
for (; f_iter != pending_events.end(); ++f_iter) {
xcb_generic_event_t *f_ev = *f_iter;
for (size_t j = i + 1; j < pending_events.size(); ++j) {
xcb_generic_event_t *f_ev = pending_events.at(j);
if ((f_ev->response_type & ~0x80) == XCB_KEY_PRESS) {
xcb_key_press_event_t *f_key =
@ -84,7 +81,7 @@ void XcbDevice::handleEvents() {
if (key->detail == f_key->detail &&
key->event == f_key->event) {
f_iter = pending_events.erase(f_iter);
pending_events.erase(pending_events.begin() + j);
repeat = true;
break;
}

3
driver/device_xcb.h
View File

@ -25,7 +25,8 @@ public:
std::map<xcb_window_t, XcbWindow *> windows;
std::vector<xcb_generic_event_t*> pending_events;
std::vector<xcb_generic_event_t *> pending_events;
public:
XcbDevice(::Display *display, int screen, xcb_connection_t *xcb_connection,
xcb_screen_t *xcb_screen, Own<InputStream> &&an);