[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] pnetlib/Xsharp Display.cs, 1.12, 1.13 GrabWindow.c
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] pnetlib/Xsharp Display.cs, 1.12, 1.13 GrabWindow.cs, 1.5, 1.6 InputOnlyWidget.cs, 1.5, 1.6 InputOutputWidget.cs, 1.4, 1.5 RootWindow.cs, 1.4, 1.5 TopLevelWindow.cs, 1.10, 1.11 |
|
Date: |
Fri, 21 Nov 2003 03:40:44 +0000 |
Update of /cvsroot/dotgnu-pnet/pnetlib/Xsharp
In directory subversions:/tmp/cvs-serv23598/Xsharp
Modified Files:
Display.cs GrabWindow.cs InputOnlyWidget.cs
InputOutputWidget.cs RootWindow.cs TopLevelWindow.cs
Log Message:
Access common event member fields directly, rather than via properties,
to reduce the number of method calls that are needed to break an event
down into its components.
Index: GrabWindow.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/GrabWindow.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GrabWindow.cs 8 Sep 2003 23:53:11 -0000 1.5
--- GrabWindow.cs 21 Nov 2003 03:40:42 -0000 1.6
***************
*** 335,339 ****
PopupWindow popup;
InputOutputWidget child = null;
! switch(xevent.type)
{
case EventType.ButtonPress:
--- 335,339 ----
PopupWindow popup;
InputOutputWidget child = null;
! switch((EventType)(xevent.xany.type__))
{
case EventType.ButtonPress:
Index: TopLevelWindow.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/TopLevelWindow.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TopLevelWindow.cs 21 Nov 2003 03:20:48 -0000 1.10
--- TopLevelWindow.cs 21 Nov 2003 03:40:42 -0000 1.11
***************
*** 856,860 ****
InputOnlyWidget io;
! switch(xevent.type)
{
case EventType.ClientMessage:
--- 856,860 ----
InputOnlyWidget io;
! switch((EventType)(xevent.xany.type__))
{
case EventType.ClientMessage:
Index: InputOutputWidget.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/InputOutputWidget.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InputOutputWidget.cs 24 Jul 2003 00:31:32 -0000 1.4
--- InputOutputWidget.cs 21 Nov 2003 03:40:42 -0000 1.5
***************
*** 436,440 ****
internal override void DispatchEvent(ref XEvent xevent)
{
! switch(xevent.type)
{
case EventType.Expose:
--- 436,440 ----
internal override void DispatchEvent(ref XEvent xevent)
{
! switch((EventType)(xevent.xany.type__))
{
case EventType.Expose:
***************
*** 446,453 ****
// This is the first
rectangle in an expose.
exposeRegion = new
Region
!
(xevent.xexpose.x,
!
xevent.xexpose.y,
!
xevent.xexpose.width,
!
xevent.xexpose.height);
// Queue this widget
for later repainting.
--- 446,453 ----
// This is the first
rectangle in an expose.
exposeRegion = new
Region
!
((int)(xevent.xexpose.x__),
!
(int)(xevent.xexpose.y__),
!
(int)(xevent.xexpose.width__),
!
(int)(xevent.xexpose.height__));
// Queue this widget
for later repainting.
***************
*** 460,467 ****
// This is an extra
rectangle in an expose.
exposeRegion.Union
!
(xevent.xexpose.x,
!
xevent.xexpose.y,
!
xevent.xexpose.width,
!
xevent.xexpose.height);
}
}
--- 460,467 ----
// This is an extra
rectangle in an expose.
exposeRegion.Union
!
((int)(xevent.xexpose.x__),
!
(int)(xevent.xexpose.y__),
!
(int)(xevent.xexpose.width__),
!
(int)(xevent.xexpose.height__));
}
}
Index: RootWindow.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/RootWindow.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RootWindow.cs 21 Nov 2003 01:15:33 -0000 1.4
--- RootWindow.cs 21 Nov 2003 03:40:42 -0000 1.5
***************
*** 265,269 ****
internal override void DispatchEvent(ref XEvent xevent)
{
! if(xevent.type == EventType.PropertyNotify &&
xevent.xproperty.atom == resourceManager)
{
--- 265,270 ----
internal override void DispatchEvent(ref XEvent xevent)
{
! if(((EventType)(xevent.xany.type__)) ==
! EventType.PropertyNotify &&
xevent.xproperty.atom == resourceManager)
{
Index: InputOnlyWidget.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/InputOnlyWidget.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InputOnlyWidget.cs 21 Nov 2003 01:15:33 -0000 1.5
--- InputOnlyWidget.cs 21 Nov 2003 03:40:42 -0000 1.6
***************
*** 620,624 ****
Xlib.Time time;
! switch(xevent.type)
{
case EventType.ButtonPress:
--- 620,624 ----
Xlib.Time time;
! switch((EventType)(xevent.xany.type__))
{
case EventType.ButtonPress:
Index: Display.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Display.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Display.cs 21 Nov 2003 01:15:33 -0000 1.12
--- Display.cs 21 Nov 2003 03:40:42 -0000 1.13
***************
*** 684,688 ****
// Record the time at which the event occurred.
We need
// this to process keyboard and pointer grabs
correctly.
! switch(xevent.type)
{
case EventType.KeyPress:
--- 684,688 ----
// Record the time at which the event occurred.
We need
// this to process keyboard and pointer grabs
correctly.
! switch((EventType)(xevent.xany.type__))
{
case EventType.KeyPress:
***************
*** 746,750 ****
// Find the widget that should process the
event.
! Widget widget = handleMap[xevent.window];
// Dispatch the event to the widget.
--- 746,750 ----
// Find the widget that should process the
event.
! Widget widget = handleMap[xevent.xany.window];
// Dispatch the event to the widget.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] pnetlib/Xsharp Display.cs, 1.12, 1.13 GrabWindow.cs, 1.5, 1.6 InputOnlyWidget.cs, 1.5, 1.6 InputOutputWidget.cs, 1.4, 1.5 RootWindow.cs, 1.4, 1.5 TopLevelWindow.cs, 1.10, 1.11,
Rhys Weatherley <address@hidden> <=