poser: Update to new timer implementation

Update poser and adapt to the slightly changed API for PSC_Timer. The new implementation doesn't use POSIX interval timers but instead multiplexes on top of setitimer(). This should make Xmoji compatible with systems like OpenBSD that don't offer the newer interval timers. Fixes: #4
Zirias · Aug 9, 2024 · eb06b53 · eb06b53
1 parent fe69c78
commit eb06b53
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/poser b/poser
diff --git a/src/bin/xmoji/keyinjector.c b/src/bin/xmoji/keyinjector.c
@@ -47,7 +47,6 @@ static void resetkmap(void *receiver, void *sender, void *args)
     (void)sender;
     (void)args;
 
-    PSC_Timer_stop(after);
     xcb_connection_t *c = X11Adapter_connection();
     const xcb_setup_t *setup = xcb_get_setup(c);
     CHECK(xcb_change_keyboard_mapping(c, queue[queuefront].len,
@@ -64,7 +63,6 @@ static void fakekeys(void *receiver, void *sender, void *args)
     (void)sender;
     (void)args;
 
-    PSC_Timer_stop(before);
     xcb_connection_t *c = X11Adapter_connection();
     const xcb_setup_t *setup = xcb_get_setup(c);
     for (unsigned x = 0; x < queue[queuefront].len; ++x)
@@ -77,7 +75,7 @@ static void fakekeys(void *receiver, void *sender, void *args)
 		"KeyInjector: Cannot inject fake key release event", 0);
     }
 
-    PSC_Timer_start(after);
+    PSC_Timer_start(after, 0);
 }
 
 static void doinject(void *obj, unsigned sequence,
@@ -151,7 +149,7 @@ static void doinject(void *obj, unsigned sequence,
     queue[queuefront].len = len;
     queue[queuefront].symspercode = kmap->keysyms_per_keycode;
 
-    if (before) PSC_Timer_start(before);
+    if (before) PSC_Timer_start(before, 0);
     else fakekeys(0, 0, 0);
 }
 

diff --git a/src/bin/xmoji/textbox.c b/src/bin/xmoji/textbox.c
@@ -288,7 +288,7 @@ static void keyboardGrabbed(void *obj, unsigned sequence,
 static int activate(void *obj)
 {
     TextBox *self = Object_instance(obj);
-    PSC_Timer_start(self->cursorBlink);
+    PSC_Timer_start(self->cursorBlink, 1);
     self->cursorvisible = 1;
     Widget_setBackground(self, 1, COLOR_BG_ACTIVE);
     Widget_invalidate(self);

diff --git a/src/bin/xmoji/tooltip.c b/src/bin/xmoji/tooltip.c
@@ -19,7 +19,6 @@ static void timeout(void *receiver, void *sender, void *args)
     (void)args;
 
     Tooltip *self = receiver;
-    PSC_Timer_stop(self->timer);
     if (self->window)
     {
 	Window_showTooltip(self->window, self->label, self->parent);
@@ -47,7 +46,7 @@ Tooltip *Tooltip_create(const UniStr *text, Widget *parent, unsigned delay)
 void Tooltip_activate(Tooltip *self, Window *window)
 {
     self->window = window;
-    PSC_Timer_start(self->timer);
+    PSC_Timer_start(self->timer, 0);
 }
 
 void Tooltip_cancel(Tooltip *self)

diff --git a/src/bin/xmoji/x11app.c b/src/bin/xmoji/x11app.c
@@ -72,7 +72,6 @@ static void svshutdown(void *receiver, void *sender, void *args)
     Object_vcallv(X11App, shutdown, self);
     if (PSC_List_size(self->windows))
     {
-	PSC_Service_setTickInterval(1000);
 	PSC_Service_shutdownLock();
 	self->quitting = 1;
 	PSC_ListIterator *i = PSC_List_iterator(self->windows);

diff --git a/src/bin/xmoji/xselection.c b/src/bin/xmoji/xselection.c
@@ -416,7 +416,7 @@ static void XSelectionRequest_start(XSelectionRequest *self)
 	PSC_Timer_setMs(self->timeout, REQUESTTIMEOUT);
 	PSC_Event_register(PSC_Timer_expired(self->timeout), self,
 		XSelectionRequest_timedout, 0);
-	PSC_Timer_start(self->timeout);
+	PSC_Timer_start(self->timeout, 0);
 	AWAIT(xcb_change_property(c, XCB_PROP_MODE_REPLACE, self->requestor,
 		    self->property, A(INCR), 32, 1, &incr),
 		self, XSelectionRequest_checkError);
@@ -720,7 +720,7 @@ static void XSelectionConvert_readProperty(void *obj, unsigned sequence,
 	PSC_Timer_setMs(self->timeout, REQUESTTIMEOUT);
 	PSC_Event_register(Window_propertyChanged(self->selection->w),
 		self, XSelectionConvert_readIncr, self->property);
-	PSC_Timer_start(self->timeout);
+	PSC_Timer_start(self->timeout, 0);
 	self->recvincr = 1;
 	if (self->next) XSelectionConvert_start(self->next);
 	return;
@@ -851,7 +851,7 @@ static void XSelectionConvert_start(XSelectionConvert *self)
     PSC_Timer_setMs(self->timeout, CONVERTTIMEOUT);
     PSC_Event_register(PSC_Timer_expired(self->timeout), self,
 	    XSelectionConvert_timedout, 0);
-    PSC_Timer_start(self->timeout);
+    PSC_Timer_start(self->timeout, 0);
     self->target = A(TARGETS);
     XSelectionConvert_convert(self);
 }
+6 −4		include/poser/core/timer.h
+0 −1		src/lib/core/core.mk
+46 −144		src/lib/core/service.c
+0 −14		src/lib/core/service.h
+135 −36		src/lib/core/timer.c
+1 −1		src/lib/core/timer.h