Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
f70356eb
Commit
f70356eb
authored
May 24, 2003
by
Cyril Deguet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* events aren't perfect yet, but it is better enough to commit
parent
58fe5c23
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
13 deletions
+14
-13
modules/gui/skins/x11/x11_bitmap.cpp
modules/gui/skins/x11/x11_bitmap.cpp
+5
-5
modules/gui/skins/x11/x11_run.cpp
modules/gui/skins/x11/x11_run.cpp
+2
-3
modules/gui/skins/x11/x11_theme.cpp
modules/gui/skins/x11/x11_theme.cpp
+3
-4
modules/gui/skins/x11/x11_window.cpp
modules/gui/skins/x11/x11_window.cpp
+4
-1
No files found.
modules/gui/skins/x11/x11_bitmap.cpp
View file @
f70356eb
...
...
@@ -2,7 +2,7 @@
* x11_bitmap.cpp: X11 implementation of the Bitmap class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_bitmap.cpp,v 1.
5 2003/05/19 21:39:34
asmax Exp $
* $Id: x11_bitmap.cpp,v 1.
6 2003/05/24 21:28:29
asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -135,13 +135,12 @@ void X11Bitmap::DrawBitmap( int x, int y, int w, int h, int xRef, int yRef,
//---------------------------------------------------------------------------
bool
X11Bitmap
::
Hit
(
int
x
,
int
y
)
{
//
unsigned int c = (unsigned int)GetBmpPixel( x, y );
unsigned
int
c
=
(
unsigned
int
)
GetBmpPixel
(
x
,
y
);
/*
if( c == -1 || c == AlphaColor )
if
(
c
==
-
1
||
c
==
AlphaColor
)
return
false
;
else
return true;*/
return
true
;
return
true
;
}
//---------------------------------------------------------------------------
int
X11Bitmap
::
GetBmpPixel
(
int
x
,
int
y
)
...
...
@@ -149,6 +148,7 @@ int X11Bitmap::GetBmpPixel( int x, int y )
if
(
!
Bmp
||
x
<
0
||
x
>=
Width
||
y
<
0
||
y
>=
Height
)
return
-
1
;
return
42
;
/* guchar *pixels;
int rowstride, offset;
gboolean has_alpha;
...
...
modules/gui/skins/x11/x11_run.cpp
View file @
f70356eb
...
...
@@ -2,7 +2,7 @@
* x11_run.cpp:
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_run.cpp,v 1.
7 2003/05/24 20:54:27 gbazin
Exp $
* $Id: x11_run.cpp,v 1.
8 2003/05/24 21:28:29 asmax
Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
...
...
@@ -242,10 +242,9 @@ void ProcessEvent( intf_thread_t *p_intf, VlcProc *proc, XEvent *event )
Window
wnd
=
((
XAnyEvent
*
)
event
)
->
window
;
// fprintf(stderr,"event %d %x\n", event->type, wnd);
// Create event to dispatch in windows
// Skin event
if
(
event
->
type
==
ClientMessage
)
{
msg
=
(
(
XClientMessageEvent
*
)
event
)
->
data
.
l
[
0
];
...
...
modules/gui/skins/x11/x11_theme.cpp
View file @
f70356eb
...
...
@@ -2,7 +2,7 @@
* x11_theme.cpp: X11 implementation of the Theme class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_theme.cpp,v 1.
3 2003/05/19 21:39:34
asmax Exp $
* $Id: x11_theme.cpp,v 1.
4 2003/05/24 21:28:29
asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
...
...
@@ -170,8 +170,7 @@ void X11Theme::AddWindow( string name, int x, int y, bool visible,
Window
wnd
=
XCreateSimpleWindow
(
display
,
root
,
0
,
0
,
1
,
1
,
0
,
0
,
0
);
XSelectInput
(
display
,
wnd
,
ExposureMask
|
KeyPressMask
|
KeyReleaseMask
|
ButtonPressMask
|
ButtonReleaseMask
|
PointerMotionMask
|
PointerMotionHintMask
|
EnterWindowMask
|
LeaveWindowMask
);
PointerMotionMask
|
EnterWindowMask
|
LeaveWindowMask
);
// Changing decorations
struct
{
...
...
@@ -193,7 +192,7 @@ void X11Theme::AddWindow( string name, int x, int y, bool visible,
// Display the window
XMapRaised
(
display
,
wnd
);
X
Flush
(
display
);
X
Sync
(
display
,
False
);
WindowList
.
push_back
(
(
SkinWindow
*
)
new
OSWindow
(
p_intf
,
wnd
,
x
,
y
,
visible
,
fadetime
,
alpha
,
movealpha
,
dragdrop
,
name
)
)
;
...
...
modules/gui/skins/x11/x11_window.cpp
View file @
f70356eb
...
...
@@ -2,7 +2,7 @@
* x11_window.cpp: X11 implementation of the Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: x11_window.cpp,v 1.
5 2003/05/19 21:39:34
asmax Exp $
* $Id: x11_window.cpp,v 1.
6 2003/05/24 21:28:29
asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
...
...
@@ -113,6 +113,9 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
gint mask = 0;
ToolTipWindow = gdk_window_new( gwnd, &attr, mask);*/
Open
();
fprintf
(
stderr
,
"kludge in x11_window.cpp
\n
"
);
}
//---------------------------------------------------------------------------
X11Window
::~
X11Window
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment