sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cosmetic updates from review of last PR.

Browse Source
This commit is contained in:
Gregory Nutt 2018-11-12 09:43:33 -06:00
parent fe0532c226
commit 1a754deaa0
2 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/nxmu/nxmu_mouse.c
View File

@ -1,7 +1,8 @@
/**************************************************************************** /****************************************************************************
* graphics/nxmu/nxmu__mouse.c * graphics/nxmu/nxmu__mouse.c
* *
* Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2011-2012, 2018 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -53,10 +54,10 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
static struct nxgl_point_s g_mpos; static struct nxgl_point_s g_mpos;
static struct nxgl_point_s g_mrange; static struct nxgl_point_s g_mrange;
static uint8_t g_mbutton; static uint8_t g_mbutton;
static struct nxbe_window_s *g_mwnd; static FAR struct nxbe_window_s *g_mwnd;
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@ -71,7 +72,8 @@ static struct nxbe_window_s *g_mwnd;
* *
****************************************************************************/ ****************************************************************************/
static struct nxbe_window_s *nxmu_revalidate_g_mwnd(struct nxbe_window_s *wnd) static struct nxbe_window_s *
nxmu_revalidate_g_mwnd(FAR struct nxbe_window_s *wnd)
{ {
if (!g_mwnd) if (!g_mwnd)
{ {
@ -147,7 +149,8 @@ int nxmu_mousereport(struct nxbe_window_s *wnd)
outmsg.buttons = g_mbutton; outmsg.buttons = g_mbutton;
nxgl_vectsubtract(&outmsg.pos, &g_mpos, &wnd->bounds.pt1); nxgl_vectsubtract(&outmsg.pos, &g_mpos, &wnd->bounds.pt1);
return nxmu_sendclientwindow(wnd, &outmsg, sizeof(struct nxclimsg_mousein_s)); return nxmu_sendclientwindow(wnd, &outmsg,
sizeof(struct nxclimsg_mousein_s));
} }
} }
@ -169,7 +172,7 @@ int nxmu_mousereport(struct nxbe_window_s *wnd)
int nxmu_mousein(FAR struct nxfe_state_s *fe, int nxmu_mousein(FAR struct nxfe_state_s *fe,
FAR const struct nxgl_point_s *pos, int buttons) FAR const struct nxgl_point_s *pos, int buttons)
{ {
struct nxbe_window_s *wnd; FAR struct nxbe_window_s *wnd;
nxgl_coord_t x = pos->x; nxgl_coord_t x = pos->x;
nxgl_coord_t y = pos->y; nxgl_coord_t y = pos->y;
uint8_t oldbuttons; uint8_t oldbuttons;
@ -227,6 +230,7 @@ int nxmu_mousein(FAR struct nxfe_state_s *fe,
else else
{ {
/* Ignore events until the button is released */ /* Ignore events until the button is released */
return OK; return OK;
} }
} }

36
libs/libnx/nxtk/nxtk_bitmapwindow.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* libs/libnx/nxtk/nxtk_bitmapwindow.c * libs/libnx/nxtk/nxtk_bitmapwindow.c
* *
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2011, 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -48,26 +48,6 @@
#include "nxtk.h" #include "nxtk.h"
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -96,7 +76,8 @@
int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
FAR const void **src, FAR const void **src,
FAR const struct nxgl_point_s *origin, unsigned int stride) FAR const struct nxgl_point_s *origin,
unsigned int stride)
{ {
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd; FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
struct nxgl_point_s wndorigin; struct nxgl_point_s wndorigin;
@ -118,10 +99,11 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
nxtk_subwindowclip(fwnd, &clipdest, dest, &fwnd->fwrect); nxtk_subwindowclip(fwnd, &clipdest, dest, &fwnd->fwrect);
/* Just return if completely outside screen */ /* Just return if completely outside screen */
if (nxgl_nullrect(&clipdest)) if (nxgl_nullrect(&clipdest))
{ {
return OK; return OK;
} }
/* Now, move the bitmap origin so that it is relative to the containing /* Now, move the bitmap origin so that it is relative to the containing
* window, not the sub-window. * window, not the sub-window.
@ -131,8 +113,8 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
nxgl_vectoradd(&wndorigin, origin, &fwnd->fwrect.pt1); nxgl_vectoradd(&wndorigin, origin, &fwnd->fwrect.pt1);
/* Then move the origin so that is relative to the containing window, not the /* Then move the origin so that is relative to the containing window, not
* client subwindow * the client subwindow
*/ */
nxgl_vectsubtract(&wndorigin, &wndorigin, &fwnd->wnd.bounds.pt1); nxgl_vectsubtract(&wndorigin, &wndorigin, &fwnd->wnd.bounds.pt1);