Mercurial > dwindows

diff win/dw.c @ 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 2e804b4db81e
children b0712a3debe2
line wrap: on
line diff
--- a/win/dw.c	Tue Jul 27 23:09:52 2021 +0000
+++ b/win/dw.c	Sun Aug 01 12:17:07 2021 +0000
@@ -361,9 +361,9 @@
     }
 }
 
-typedef struct _sighandler
-{
-   struct _sighandler   *next;
+typedef struct _dwsighandler
+{
+   struct _dwsighandler   *next;
    ULONG message;
    HWND window;
    int id;
@@ -371,9 +371,9 @@
    void *discfunction;
    void *data;
 
-} SignalHandler;
-
-SignalHandler *Root = NULL;
+} DWSignalHandler;
+
+DWSignalHandler *Root = NULL;
 
 typedef struct
 {
@@ -1085,7 +1085,7 @@
  */
 void _dw_new_signal(ULONG message, HWND window, int id, void *signalfunction, void *discfunc, void *data)
 {
-   SignalHandler *new = malloc(sizeof(SignalHandler));
+   DWSignalHandler *new = malloc(sizeof(DWSignalHandler));
 
    new->message = message;
    new->window = window;
@@ -1101,7 +1101,7 @@
    }
    else
    {
-      SignalHandler *prev = NULL, *tmp = Root;
+      DWSignalHandler *prev = NULL, *tmp = Root;
       while(tmp)
       {
          if(tmp->message == message &&
@@ -2151,7 +2151,7 @@
 LRESULT CALLBACK _dw_wndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
 {
    int result = -1, taskbar = FALSE;
-   SignalHandler *tmp = Root;
+   DWSignalHandler *tmp = Root;
    void (DWSIGNAL *windowfunc)(PVOID);
    ULONG origmsg = msg;
 
@@ -3265,7 +3265,7 @@
       )
    {
       /* Generate click on default item */
-      SignalHandler *tmp = Root;
+      DWSignalHandler *tmp = Root;
 
       /* Find any callbacks for this function */
       while (tmp)
@@ -3693,7 +3693,7 @@
          }
 
          {
-            SignalHandler *tmp = Root;
+            DWSignalHandler *tmp = Root;
 
             while(tmp)
             {
@@ -3712,7 +3712,7 @@
       break;
    case WM_CONTEXTMENU:
       {
-         SignalHandler *tmp = Root;
+         DWSignalHandler *tmp = Root;
          void **params = NULL;
          while(tmp)
          {
@@ -4402,7 +4402,7 @@
       break;
    case WM_LBUTTONUP:
       {
-         SignalHandler *tmp = Root;
+         DWSignalHandler *tmp = Root;
 
          /* Find any callbacks for this function */
          while(tmp)
@@ -4438,7 +4438,7 @@
           */
          if(LOWORD(mp1) == '\r' || LOWORD(mp1) == ' ')
          {
-            SignalHandler *tmp = Root;
+            DWSignalHandler *tmp = Root;
 
             /* Find any callbacks for this function */
             while(tmp)
@@ -6492,7 +6492,7 @@
 /* Internal function to make sure menu ID isn't in use */
 int _dw_menuid_allocated(int id)
 {
-   SignalHandler *tmp = Root;
+   DWSignalHandler *tmp = Root;
 
    while(tmp)
    {
@@ -13600,7 +13600,7 @@
  */
 void API dw_timer_disconnect(HTIMER id)
 {
-   SignalHandler *prev = NULL, *tmp = Root;
+   DWSignalHandler *prev = NULL, *tmp = Root;
 
    /* 0 is an invalid timer ID */
    if(!id)
@@ -13696,7 +13696,7 @@
  */
 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
 {
-   SignalHandler *prev = NULL, *tmp = Root;
+   DWSignalHandler *prev = NULL, *tmp = Root;
    ULONG message;
 
    if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0)
@@ -13741,7 +13741,7 @@
  */
 void API dw_signal_disconnect_by_window(HWND window)
 {
-   SignalHandler *prev = NULL, *tmp = Root;
+   DWSignalHandler *prev = NULL, *tmp = Root;
 
    while(tmp)
    {
@@ -13783,7 +13783,7 @@
  */
 void API dw_signal_disconnect_by_data(HWND window, void *data)
 {
-   SignalHandler *prev = NULL, *tmp = Root;
+   DWSignalHandler *prev = NULL, *tmp = Root;
 
    while(tmp)
    {