Mercurial > dwindows

diff android/dw.cpp @ 2626:401a3b9f21ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Massive continuation of code style standardization. Only tested on Mac and iOS, may require follow up commits to get things building again as I test on various platforms.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 01 Aug 2021 12:17:07 +0000
parents dcd71b04cc46
children e9f4f0d2e5da
line wrap: on
line diff
--- a/android/dw.cpp	Tue Jul 27 23:09:52 2021 +0000
+++ b/android/dw.cpp	Sun Aug 01 12:17:07 2021 +0000
@@ -199,9 +199,9 @@
     dw_thread_new((void *) _dw_main_launch, arg, 0);
 }
 
-typedef struct _sighandler
-{
-    struct _sighandler   *next;
+typedef struct _dwsighandler
+{
+    struct _dwsighandler   *next;
     ULONG message;
     HWND window;
     int id;
@@ -209,13 +209,13 @@
     void *discfunction;
     void *data;
 
-} SignalHandler;
-
-static SignalHandler *DWRoot = nullptr;
-
-SignalHandler *_dw_get_handler(HWND window, int messageid)
-{
-    SignalHandler *tmp = DWRoot;
+} DWSignalHandler;
+
+static DWSignalHandler *DWRoot = nullptr;
+
+DWSignalHandler *_dw_get_handler(HWND window, int messageid)
+{
+    DWSignalHandler *tmp = DWRoot;
     JNIEnv *env;
 
     if((env = (JNIEnv *)pthread_getspecific(_dw_env_key))) {
@@ -266,7 +266,7 @@
 
 int _dw_event_handler2(void **params)
 {
-    SignalHandler *handler = (SignalHandler *)params[9];
+    DWSignalHandler *handler = (DWSignalHandler *)params[9];
     int message = DW_POINTER_TO_INT(params[8]);
     int retval = -1;
 
@@ -461,7 +461,7 @@
 }
 
 int _dw_event_handler(jobject object, void **params) {
-    SignalHandler *handler = _dw_get_handler(object, DW_POINTER_TO_INT(params[8]));
+    DWSignalHandler *handler = _dw_get_handler(object, DW_POINTER_TO_INT(params[8]));
 
     if (handler)
     {
@@ -661,7 +661,7 @@
  */
 void _dw_new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data)
 {
-    SignalHandler *newsig = (SignalHandler *)malloc(sizeof(SignalHandler));
+    DWSignalHandler *newsig = (DWSignalHandler *)malloc(sizeof(DWSignalHandler));
 
     newsig->message = message;
     newsig->window = window;
@@ -675,7 +675,7 @@
         DWRoot = newsig;
     else
     {
-        SignalHandler *prev = nullptr, *tmp = DWRoot;
+        DWSignalHandler *prev = nullptr, *tmp = DWRoot;
         while(tmp)
         {
             if(tmp->message == message &&
@@ -5913,7 +5913,7 @@
  */
 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
 {
-    SignalHandler *prev = nullptr, *tmp = DWRoot;
+    DWSignalHandler *prev = nullptr, *tmp = DWRoot;
     ULONG message;
 
     if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0)
@@ -5958,7 +5958,7 @@
  */
 void API dw_signal_disconnect_by_window(HWND window)
 {
-    SignalHandler *prev = nullptr, *tmp = DWRoot;
+    DWSignalHandler *prev = nullptr, *tmp = DWRoot;
 
     while(tmp)
     {
@@ -6000,7 +6000,7 @@
  */
 void API dw_signal_disconnect_by_data(HWND window, void *data)
 {
-    SignalHandler *prev = nullptr, *tmp = DWRoot;
+    DWSignalHandler *prev = nullptr, *tmp = DWRoot;
 
     while(tmp)
     {