rename function to be more transparent

open-watcom · Jun 30, 2021 · 090072e · 090072e
1 parent 9b9da4f
commit 090072e
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 31 deletions.
diff --git a/bld/gui/c/guiscale.c b/bld/gui/c/guiscale.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -139,12 +140,12 @@ bool GUIScreenToScaleR( gui_coord *coord )
     return( GUIConvert( SCREEN, SCALE, coord, true ) );
 }
 
-void GUIScaleToScreenRPt( gui_point *point )
+void GUIScaleToScreenPointR( gui_point *point )
 {
     GUIConvertPoint( SCALE, SCREEN, point );
 }
 
-void GUIScreenToScaleRPt( gui_point *point )
+void GUIScreenToScalePointR( gui_point *point )
 {
     GUIConvertPoint( SCREEN, SCALE, point );
 }
diff --git a/bld/gui/h/gui.h b/bld/gui/h/gui.h
@@ -402,18 +402,18 @@ typedef const char          *res_name_or_id;
 #endif
 
 typedef struct gui_coord {
-    gui_ord x;
-    gui_ord y;
+    gui_ord             x;
+    gui_ord             y;
 } gui_coord;
 
 typedef struct gui_text_coord {
-    gui_text_ord x;
-    gui_text_ord y;
+    gui_text_ord        x;
+    gui_text_ord        y;
 } gui_text_coord;
 
 typedef struct gui_point {
-    int x;
-    int y;
+    int                 x;
+    int                 y;
 } gui_point;
 
 typedef struct gui_window   gui_window;

diff --git a/bld/gui/h/guiscale.h b/bld/gui/h/guiscale.h
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -43,7 +44,7 @@ extern bool GUIScaleToScreenR( gui_coord *coord );
 extern bool GUIScreenToScale( gui_coord *coord );
 extern bool GUIScreenToScaleR( gui_coord *coord );
 
-extern void GUIScaleToScreenRPt( gui_point *point );
-extern void GUIScreenToScaleRPt( gui_point *point );
+extern void GUIScaleToScreenPointR( gui_point *point );
+extern void GUIScreenToScalePointR( gui_point *point );
 
 #endif // _GUISCALE_H_
diff --git a/bld/gui/ui/c/guicursr.c b/bld/gui/ui/c/guicursr.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2019 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -45,7 +45,7 @@ bool GUISetCursorPos( gui_window *wnd, gui_point *point )
 
     if( wnd->style & GUI_CURSOR ) {
         pt = *point;
-        GUIScaleToScreenRPt( &pt );
+        GUIScaleToScreenPointR( &pt );
         if( ( wnd->hgadget != NULL ) && !GUI_HSCROLL_EVENTS_SET( wnd ) ) {
             pt.x -= wnd->hgadget->pos;
         }
@@ -75,7 +75,7 @@ bool GUIGetCursorPos( gui_window *wnd, gui_point *point )
     if( ( wnd->vgadget != NULL ) && !GUI_VSCROLL_EVENTS_SET( wnd ) ) {
         point->y += wnd->vgadget->pos;
     }
-    GUIScreenToScaleRPt( point );
+    GUIScreenToScalePointR( point );
     return( true );
 }
 

diff --git a/bld/gui/ui/c/guidrawr.c b/bld/gui/ui/c/guidrawr.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2019 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -159,8 +159,8 @@ bool GUIDrawLine( gui_window *wnd, gui_point *start, gui_point *end,
 
     my_start = *start;
     my_end = *end;
-    GUIScaleToScreenRPt( &my_start );
-    GUIScaleToScreenRPt( &my_end );
+    GUIScaleToScreenPointR( &my_start );
+    GUIScaleToScreenPointR( &my_end );
 
     area.row = my_start.y;
     area.height = my_end.y - my_start.y + 1;

diff --git a/bld/gui/ui/c/guifloat.c b/bld/gui/ui/c/guifloat.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -61,7 +61,7 @@ static gui_window   *MenuWnd        = NULL;
 
 static void MapLocation( gui_window *wnd, gui_point *point )
 {
-    GUIScaleToScreenRPt( point );
+    GUIScaleToScreenPointR( point );
     if( ( wnd->hgadget != NULL ) && !GUI_HSCROLL_EVENTS_SET( wnd ) ) {
         point->x -= wnd->hgadget->pos;
     }

diff --git a/bld/gui/ui/c/guigetpt.c b/bld/gui/ui/c/guigetpt.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -44,8 +45,8 @@ void GUIGetPoint( gui_window * wnd, gui_ord extent, gui_ord row,
 
     if( point != NULL ) {
         point->x = extent;
-        GUIScaleToScreenRPt( point );
+        GUIScaleToScreenPointR( point );
         point->y = row;
-        GUIScreenToScaleRPt( point );
+        GUIScreenToScalePointR( point );
     }
 }
diff --git a/bld/gui/ui/c/guigetrc.c b/bld/gui/ui/c/guigetrc.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2018-2018 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2018-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -46,7 +46,7 @@ gui_ord GUIGetRow( gui_window * wnd, gui_point * in_pt )
     /* unused parameters */ (void)wnd;
 
     pt = *in_pt;
-    GUIScaleToScreenRPt( &pt );
+    GUIScaleToScreenPointR( &pt );
     if( pt.y >=0 ) {
         return( (gui_ord) pt.y );
     } else {
@@ -65,7 +65,7 @@ gui_ord GUIGetCol( gui_window *wnd, const char *text, gui_point *in_pt )
     /* unused parameters */ (void)wnd; (void)text;
 
     pt = *in_pt;
-    GUIScaleToScreenRPt( &pt );
+    GUIScaleToScreenPointR( &pt );
     if( pt.x >=0 ) {
         return( (gui_ord) pt.x );
     } else {

diff --git a/bld/gui/win/c/guidrawr.c b/bld/gui/win/c/guidrawr.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -138,8 +139,8 @@ static bool DrawLine( gui_window *wnd, gui_point *start, gui_point *end,
 
     my_start = *start;
     my_end = *end;
-    GUIScaleToScreenRPt( &my_start );
-    GUIScaleToScreenRPt( &my_end );
+    GUIScaleToScreenPointR( &my_start );
+    GUIScaleToScreenPointR( &my_end );
     if( GUI_DO_VSCROLL( wnd ) ) {
         vscroll = GUIGetScrollPos( wnd, SB_VERT );
     } else {

diff --git a/bld/gui/win/c/guifloat.c b/bld/gui/win/c/guifloat.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -56,7 +57,7 @@ bool GUITrackFloatingPopup( gui_window *wnd, gui_point *location,
         return( false );
     }
 
-    GUIScaleToScreenRPt( location );
+    GUIScaleToScreenPointR( location );
     _wpi_getrectvalues( wnd->hwnd_client_rect, &left, &top, &right, &bottom );
     location->x += left;
     location->y += top;

diff --git a/bld/gui/win/c/guigetpt.c b/bld/gui/win/c/guigetpt.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -44,8 +45,8 @@ void GUIGetPoint( gui_window * wnd, gui_ord extent, gui_ord row, gui_point *poin
         return;
     }
     point->x = extent;
-    GUIScaleToScreenRPt( point );
+    GUIScaleToScreenPointR( point );
     GUIGetMetrics( wnd );
     point->y = row * AVGYCHAR( GUItm );
-    GUIScreenToScaleRPt( point );
+    GUIScreenToScalePointR( point );
 }
diff --git a/bld/gui/win/c/guigetrc.c b/bld/gui/win/c/guigetrc.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -48,7 +49,7 @@ gui_ord GUIGetRow( gui_window * wnd, gui_point * in_pos )
     GUIGetMetrics( wnd );
     height = AVGYCHAR( GUItm );
 
-    GUIScaleToScreenRPt( &pos );
+    GUIScaleToScreenPointR( &pos );
     row = pos.y / height;
     return( row );
 }
@@ -62,7 +63,7 @@ gui_ord GUIGetCol( gui_window *wnd, const char *text, gui_point *in_pos )
     got_new = GUIGetTheDC( wnd );
     GUIGetMetrics( wnd );
     pos = *in_pos;
-    GUIScaleToScreenRPt( &pos );
+    GUIScaleToScreenPointR( &pos );
     width = pos.x / MAXXCHAR( GUItm );
     while( ( width < strlen( text ) ) && ( GUIGetTextExtentX( wnd, text, width ) <= pos.x ) ) {
         width++ ;

diff --git a/bld/gui/win/c/guixutil.c b/bld/gui/win/c/guixutil.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -478,7 +479,7 @@ void GUIMakeRelative( gui_window *wnd, WPI_POINT *pt, gui_point *point )
             point->y += GUIGetScrollPos( wnd, SB_VERT );
         }
     }
-    GUIScreenToScaleRPt( point );
+    GUIScreenToScalePointR( point );
 }
 
 HWND GUIGetScrollHWND( gui_window *wnd )