48d49eb5f9
Add some new things to .gitignore
...
libtoytoolkit.a, and generated protocol headers for meego-tablet.
2011-04-29 10:30:13 -04:00
80492e220a
configure: Only check dependencies for the enabled compositor backends
2011-04-26 11:10:32 -04:00
bde55ec8e4
Implement buffer.damage in shm, use it in window.c
2011-04-22 11:53:45 -04:00
7cbdb64ab6
Fix clients to work with wl_ prefixed interface names
2011-04-20 18:53:37 -04:00
cf57dc52ff
Update to work with scanner that doesn't hardcode wl_*
...
This lets us drop the wl_ prefix for the un-officual screenshooter protocol.
2011-04-20 14:20:02 -04:00
91342c6081
Switch to new subscribe protocol and wayland-egl
2011-04-20 14:20:02 -04:00
d11eadb519
window.c: Check for cairo device failure the right way
2011-04-14 11:54:59 -04:00
01aed1c665
Remove double definition of window_get_wl_surface()
2011-04-11 16:59:05 -04:00
11e2828bdc
Merge remote-tracking branch 'bnf/surface-frame-event'
...
Conflicts:
compositor/compositor.c
2011-04-11 16:47:50 -04:00
12b0bb343b
Fix window_set_child_size() for windows without decoration
2011-04-11 13:18:31 -04:00
386857ba6a
Add struct window accessor for the wl_surface
2011-04-11 13:17:44 -04:00
b4b67344f0
Define global handler on display creation
...
Otherwise the initial announcement of interfaces gets lost.
2011-04-11 13:16:33 -04:00
8d85e886fc
Merge remote-tracking branch 'bnf/fixes'
2011-03-18 00:15:25 -04:00
cff904e69d
gears: Use wayland egl surface instead of images
2011-03-17 15:55:25 +01:00
6693ac2108
window: Use window surfaces for windows
2011-03-17 15:55:18 +01:00
2eae9e3f1c
simple-client: Request a alpha channel in choose config
2011-03-17 15:43:21 +01:00
ec4d342aa9
Support per surface frame events
...
This fixes tearing with multi head.
2011-03-17 11:54:35 +01:00
b2d71852fd
Split into a demo repository that holds the demo compositor and clients
2011-02-14 22:13:33 -05:00
9c7a8cc663
fix typo in window.c
2011-02-11 13:44:31 -05:00
0d5007a76f
window.c: Use eglGetProcAddress to look up extension functions
2011-02-09 10:57:44 -05:00
297d6dd442
window.c: Include wayland-egl.h before EGL headers so we get the right platform
2011-02-09 10:51:15 -05:00
3eff366911
Add struct wl_egl_display argument to wl_egl_window_create
...
We don't need it in the mesa implementation, but other implementations
might and it's symmetric with wl_egl_pixmap_create().
2011-02-07 20:48:01 -05:00
bfb8e61381
Follow wayland-egl renames
2011-02-07 10:30:38 -05:00
a495a5ed8b
simple-client: Port to wayland-egl and use eglSwapBuffers()
...
simple-client is simpler.
2011-02-07 09:12:56 -05:00
f57a96f98d
gears: Remove unused drm_fd field
2011-02-07 09:12:56 -05:00
297c6313eb
Port window.c to use wayland-egl
2011-02-07 09:12:56 -05:00
7b87cb04a9
window: add null checks
...
Also check for invalid parameters early on, so if we crash,
we know *why* we crashed.
2011-02-01 18:51:47 +00:00
14d222f612
add newlines in error messages
2011-02-01 18:48:46 +00:00
0ce245761c
Add initial basic support for fullscreen surfaces
2011-01-28 15:18:33 -05:00
3ba4858c4b
compositor-x11: Handle keyboard focus correctly so we avoid stuck modifiers
2011-01-27 11:57:19 -05:00
80bf6f78e4
clients/view: Fix memory leak
2011-01-25 16:33:34 -05:00
6685aceae3
clients/view: Don't try to show inexistant files
2011-01-25 16:33:25 -05:00
9aad08e91b
clients/view: Allow relative paths
2011-01-25 16:33:00 -05:00
655467a5d2
clients/view: Add mousewheel and arrow keys
2011-01-25 16:32:37 -05:00
7e182ef13b
clients/view: Remove unnecessary variables
2011-01-25 16:29:51 -05:00
1afc9a98fa
clients/view: Do not browse outside document range
2011-01-25 16:29:27 -05:00
00439617f3
Fix new gcc 4.6 warnings
...
simple-client.c:156:10: warning: variable ‘ar’ set but not used [-Wunused-but-set-variable]
etc.
2011-01-25 15:16:01 -05:00
c4df99cb2c
Replace gdk_pixbuf_unref with g_object_unref
...
Because gdk_pixbuf_unref is deprecated and for compatability with
gdk-pixbuf 2.21.4.
2011-01-25 15:05:08 -05:00
d5fb9cc769
window.c: Make title not const
...
We now strdup it.
2011-01-25 12:45:37 -05:00
734a7501b6
Remove frame handler prototype
...
I messed up the merge.
2011-01-25 12:44:19 -05:00
6ec41abf72
Merge remote branch 'callum/master'
...
Conflicts:
clients/window.h
2011-01-25 10:40:01 -05:00
7d9517855a
fix includes
2011-01-24 16:01:26 +00:00
81bd979835
initialise display
...
fixes valgrind:
==25178== Conditional jump or move depends on uninitialised value(s)
==25178== at 0x409E2C: display_create (window.c:1582)
==25178== by 0x407A43: main (terminal.c:2323)
and
==13793== Conditional jump or move depends on uninitialised value(s)
==13793== at 0x40A2D1: display_handle_global (window.c:1504)
==13793== by 0x4E2C183: display_handle_global (wayland-client.c:281)
==13793== by 0x713FEE7: ffi_call_unix64 (in /usr/lib/libffi.so.5.0.10)
==13793== by 0x713FC83: ffi_call (in /usr/lib/libffi.so.5.0.10)
==13793== by 0x4E2C71A: wl_closure_invoke (connection.c:663)
==13793== by 0x4E2BB7B: wl_display_iterate (wayland-client.c:484)
==13793== by 0x4096CA: display_create (window.c:1664)
==13793== by 0x407A43: main (terminal.c:2321)
2011-01-23 17:58:30 -05:00
748f672b2c
free option context
2011-01-23 17:58:22 -05:00
eae5569558
remove unused variable
2011-01-23 17:58:18 -05:00
503ccca5c8
document the usage of libtoytoolkit
...
(krh: edited to follow window_create() API changes)
2011-01-23 14:04:35 -05:00
f71accc5b8
close terminal window on exit
2011-01-23 14:00:21 -05:00
b6761dc294
fix resizing at top/left border
2011-01-23 13:59:30 -05:00
dc3f817538
remove declaration without definition from window.h
2011-01-23 13:58:43 -05:00
b0ae49e315
remove unused function in clients/smoke.c, silence warning
2011-01-23 13:58:26 -05:00
8a6f7e3139
compositor crashes if window width or height is <= 0
2011-01-23 13:58:18 -05:00
762e5c25d6
add clients to .gitignore
2011-01-23 13:58:07 -05:00
0cd8f6eded
Drive-by optimization of blur_surface()
2011-01-21 22:19:40 -05:00
a495333d4f
Remove unused bits of cairo code
2011-01-21 22:17:03 -05:00
248c1b61ce
Add an orange pop-up menu to test the new map_transient request
2011-01-21 18:03:15 -05:00
6eeeb30021
Merge branch 'master' of git://anongit.freedesktop.org/wayland
...
Conflicts:
clients/window.h
2011-01-22 12:00:48 +13:00
6bccebee23
terminal: Just send the pty master fd to receive the selection.
...
LOL!!1
2011-01-21 16:26:28 -05:00
31cce0533f
Actually send selected text when pasting
2011-01-21 15:18:55 -05:00
e164e4ef72
Use cairo_push_group() for all double buffering, drop window_copy_*()
2011-01-21 11:35:05 -05:00
f39a9ccbb3
Use cairo_push_group() for double buffering in the terminal
...
Slightly different version of the patch from twied.
2011-01-20 12:37:41 -05:00
5982658d62
Render selection
2011-01-20 11:56:57 -05:00
23c03ad981
Use libxkbcommon #defines for modifiers
2011-01-19 14:41:20 -05:00
58eec36f68
Add proof-of-concept selection support to terminal
...
Next will be to support mouse selections so we can copy and paste
something more interesting than just 'selection data'.
2011-01-19 14:27:42 -05:00
67cac8a565
Pass input device and time in key_handler callback
...
Move the modifiers to a input device getter function.
2011-01-19 14:25:13 -05:00
943741cb40
Use the global handler in dnd instead of custom drag_offer hook
2011-01-19 14:25:12 -05:00
b46df05fa8
window: Add a catch-all global handler hook
2011-01-19 14:25:12 -05:00
25f0ba4be1
clients/Makefile: Add AM_CPPFLAGS to view's CPPFLAGS
2011-01-16 21:09:51 -05:00
ad67af1bcc
simple-client: Remove unnecessary flush
2011-01-14 20:45:23 -05:00
1a11fac8fa
simple-client: Create GLES2 context
2011-01-14 20:39:21 -05:00
a1015b9e8c
Link simple-client against libGLESv2.so, not full GL
2011-01-14 20:38:35 -05:00
be63ae5a2c
Merge remote branch 'bnf/simple_client'
2011-01-14 19:13:22 -05:00
aabdce027f
Add a simple client
2011-01-15 00:44:03 +01:00
8def264241
Check for cairo-egl instead of just cairo-gl
2011-01-14 17:42:50 -05:00
ef57a9b788
terminal: Window operations
...
Implement OSC 1 (set window title), and some basic CSI t window
operations.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-14 20:51:58 +13:00
9d708b07e4
terminal: Fix bugs in attribute rendering
...
Fixed ignoring of concealed attribute, incorrect underline colour, and
glyph_run_flush not resetting the attribute.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-13 20:30:43 +13:00
9acdb50084
Merge branch 'master' of git://anongit.freedesktop.org/wayland
...
Conflicts:
clients/terminal.c
2011-01-12 19:40:14 +13:00
67a201da6f
terminal: Escape sequences with string parameters
...
Adjust escape parsing code to handle OSC, DSC, and other escape
sequences with string parameters.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-12 19:23:41 +13:00
08c40c3550
clients: Make poppler-glib optional
...
Just don't compile the view client.
2011-01-11 13:48:03 -05:00
1d3e93922d
Batch up drawing glyphs
2011-01-11 11:06:49 -05:00
7ae6b1a27d
Hold on to the scaled fonts we use
2011-01-11 10:38:51 -05:00
4f50670769
Use cairo_show_glyphs for rendering text
...
A small step for now.
2011-01-11 10:33:53 -05:00
01994a5964
Factor out decoding of character attributes
2011-01-11 10:26:04 -05:00
fb266a3207
Only draw background if it's different from what's already there
2011-01-11 10:15:21 -05:00
71eca89356
Make border color a color from the color table
2011-01-11 10:13:00 -05:00
f106fd5b67
Add helper to set color from color table
2011-01-11 10:11:39 -05:00
8c25420a50
Split background and foreground painting into separate loops
2011-01-11 10:09:32 -05:00
da846ca91d
Fix terminal resizing
...
Get snapping to character grid working again, avoid crashes when attempting
to resize below 1x1 character cell, only redraw when size actually changes.
Also, rename window_get_child_rectangle() to window_get_child_allocation().
2011-01-11 10:00:52 -05:00
1b091dd411
Merge branch 'master' of git://anongit.freedesktop.org/wayland
2011-01-11 09:08:59 +13:00
5fd89d255b
terminal: fix crashing when terminal size is < 0
...
Just skip drawing when width or height is less than zero.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2011-01-10 14:16:42 -05:00
81179db42c
terminal: More character attributes
...
Implement the concealed attribute, and 16-colour attributes. Fix a bug in
256-colour attributes that prevented them from working in elinks.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-10 12:14:01 +13:00
86653ed273
terminal: Various fixes
...
Fix several bugs in the previous patches. Fix inverse inverse video
with bold attribute, incorrect duplication of attributes when scrolling
up, underline aliasing, bottom scroll margin adjustment when resizing,
and unnecessary sleep when sending terminal reports. Change TERM
environment variable to xterm-256color to better reflect terminal
capabilities (although it still doesn't emulate all of xterm).
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 20:35:25 -05:00
7e08e90c74
terminal: Special keys
...
Implements support for function, cursor, and editing keys, with
modifiers. Partially implements application keypad mode. Expands
control key support.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 20:35:15 -05:00
256e72f0e2
terminal: Implement character set switching
...
Includes the 3 vt100 character sets. Some of the graphic symbols don't
display because they are not included in the default font. Apparantly
the cairo toy font API doesn't do font substitution.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 20:35:05 -05:00
69e9658da0
terminal: vt102 editing commands
...
Implement the vt102 editing commands, and insert/replace mode.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 20:34:17 -05:00
8e57dd5071
terminal: Basic vt100 escape codes
...
Implements correct behaviour for vt100 cursor movement, erasing, custom
tabs, and reporting. Includes relevant terminal modes.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 20:33:46 -05:00
bbeac60b8a
terminal: Scroll margins
...
Implement scroll margins and related escape codes.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 20:33:35 -05:00
b8609ada50
terminal: Escape sequence handling fixes
...
Upgrade and refactor terminal_data to properly handle non-csi escape
codes, control characters in escape codes, and invalid escape sequences.
Also fix a buffer overflow in the escape sequence buffer.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 20:33:05 -05:00
a0ee21c7dc
terminal: Window size ioctls
...
Use TIOCSWINSZ ioctl to set window size on terminal resize.
This causes applications to be notified of the resize event.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 15:15:09 -05:00
30eeae55e0
terminal: Fancy colors
...
Includes bold, underline, inverse, and blink attributes. Blink is
rendered bold as in xterm. Supports xterm's 256 color palette.
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 15:14:55 -05:00
15bdc5d1d3
terminal: UTF-8 support
...
Signed-off-by: Callum Lowcay <callum@callumscode.com>
2011-01-08 15:14:39 -05:00
96ce968b12
gears: Include config.h
2011-01-07 14:42:49 -05:00
1926ebab73
Add missing newline in gears error message
2011-01-07 14:04:43 -05:00
9835417962
Workaround gears depending on cairo-gl
...
Extremely hacky, but at least it doesn't stop the build anymore.
2011-01-05 23:00:53 +00:00
f8475c9366
Fix window.c build without cairo-gl
2011-01-05 17:41:55 +00:00
82da52b15b
Update surface.attach and change surface.map to surface.map_toplevel
...
The new map_toplevel() request no longer specifies a position and takes
the size from the attached buffer. The attach request now takes a
position relative to the top-left corner of the old buffer to let
clients specify the relative position of the new buffer.
2010-12-17 09:53:12 -05:00
53a7f2137b
Fix the resizor
2010-12-16 21:11:10 -05:00
5c4056e049
Schedule frame callback in the redraw handler
2010-12-16 14:56:41 -05:00
7c221d278a
Add window resize sample client
...
This is an example of how to animate window resizing. The size is
animated by a simple physics model that allows the user to cancel the
animation halfway and still look good.
2010-12-16 13:35:23 -05:00
45568f6e33
When no DRM present, clients (window.c actually) now either exit orderly,
...
or if that check is removed - crash (unsurprisingly).
This patch relieves this assumption, and allow some clients (terminal,
image, flower) to run in a non-DRM environment
2010-12-06 09:20:34 -05:00
f8fc08f771
Add origin information to output.geometry event
2010-12-01 20:10:10 -05:00
2bb3ebe1e4
Create socket in /var/run/user/${HOME}
...
Use the runtime dir from XDG Base Directory Specification for creating the
socket in a directory only the user can read and write.
2010-12-01 16:53:01 -05:00
06bc26401c
Fix warnings from adding -Wall back
2010-12-01 09:50:16 -05:00
1f25315ae2
Add $(GCC_CFLAGS) back
...
Missed this when moving to automake.
2010-12-01 09:46:10 -05:00
0c007aea35
Make the dnd client actually work.
...
The dnd client now sends a mime type of
application/x-wayland-dnd-flower instead of text/plain. The dnd
message is just the position and random seed that lets the drop source
add the flower to its grid.
2010-11-30 15:42:37 -05:00
d44bc8b8ee
Add reject round trip to dnd protocol
...
This lets a drag target reject a drop.
2010-11-30 15:10:26 -05:00
41da90897c
Don't hardcode offered dnd types in window.c
2010-11-30 14:01:07 -05:00
88b272d9ff
Made the window save the coordinates when being draged.
2010-11-30 13:26:31 -05:00
35fd2a8cc6
wayland_client: rename wl_display_create to wl_display_connect
...
Avoid conflict when using wayland-{server,client} together.
2010-11-29 17:14:38 -05:00
c4b8c457e8
fix missing includes in clients/window.h and clients/wayland-glib.h
2010-11-29 08:14:57 -05:00
1f5d507596
Define MULT outside the HAVE_CAIRO_GL #ifdef
2010-11-29 08:13:35 -05:00
55973f2f5a
Some additional return value checking
2010-11-22 21:54:15 -05:00
e9f5e36730
Make clients exit orderly when there is no connection
2010-11-22 15:19:43 -05:00
8857a96a97
window: Don't call drag_offer_handler if it's NULL
...
Reported by canbaby@21cn.com .
2010-11-22 13:02:24 -05:00
156d057e56
Function declares a pointer return, so return one.
...
These two functions are just wrappers around display_create_*_surface
but weren't forwarding along the result of those calls as is implied by
their return value type.
This fixes a compile-time warning.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
2010-11-22 10:49:07 -05:00
515f63ad72
Quell warning about potentially uninitialized variable 'surface'
...
In theory, it was possible for an undefined 'surface' to be passed to
window_set_surface(). Instead, explicitly pass NULL.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
2010-11-22 10:48:52 -05:00
f57303f7cf
Expose window_set_surface() in window.h
...
gears.c uses this routine and was complaining about it being implicitly
declared.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
2010-11-22 10:48:35 -05:00
40269a6ed6
Cleanup declared but unused variables.
...
Make was complaining about a bunch of unused variables that were being
declared.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
2010-11-22 10:48:17 -05:00
7637ff0839
Clean up .gitignore files
...
Sort the contents and update .gitignore files to hide generated files from
git status output.
Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
2010-11-11 20:11:27 -05:00
2b43bd73a0
Bring gears example up to date
...
Must have gears.
2010-11-08 15:46:02 -05:00
990854d019
Fixed a bogus call to cairo_destroy
2010-11-08 08:55:50 -05:00
0bfb126e59
Add /wayland so we pick up generated header files
...
Reported by Benjamin Franzke.
2010-10-31 14:24:39 -04:00
4d8ba216c5
Make sure there is a current context.
...
The context of a display is shared with the cairo device.
cairo_acquire_device should be called whenever OpenGL calls are made.
2010-10-29 12:49:57 -04:00
1f411902de
Use glTexSubImage to update the pixels.
...
glTexImage causes respecification. The DRM buffer a client renders to
will be different from that used to create the wl_buffer.
2010-10-29 12:34:47 -04:00
332073b9db
List libtoytoolkit.la before libwayland-client.la on the link line
...
Fixes link order for --as-needed linking.
2010-10-27 15:02:51 -04:00
012a007771
Add small client for testing shm surfaces
2010-10-26 10:37:55 -04:00
d0c3b9da22
Fall back to cairo image backend and shm surface if we don't have cairo gl
2010-10-25 11:40:03 -04:00
f0152daad7
Use automake
2010-10-12 18:00:16 -04:00
118fb49eeb
Fix clients include path after moving files around
2010-10-12 13:53:13 -04:00
45115a435e
Fix screenshoot.c type in Makefile
2010-09-17 09:04:46 -04:00
3dd66d66a3
Use scanner to generate screenshooter client code as well
2010-09-14 16:23:24 -04:00
ce457ba68c
Add timestamp to pointer image attach request
...
This lets the server discard requests received after the pointer has
exited and the re-entered a surface.
2010-09-14 15:39:45 -04:00
6dd08ebbe1
Move core protocol libraries into wayland/ subdirectory
2010-09-14 12:41:55 -04:00
ab2f1cddc6
Dont post damage event from window_copy_surface
...
We always call this between window_draw() and attaching the window surface
so the surface we're copying to isn't visible.
2010-09-07 22:01:32 -04:00
7d804068b6
Only set pointer image when it changes
2010-09-07 21:50:06 -04:00
9d69f8e796
Replace commit/ack/frame protocol with simpler sync and frame callbacks
2010-09-03 14:46:38 -04:00
e9d37bdc5f
Use a transient object for the dnd session
2010-09-02 20:22:42 -04:00
8ca1cc20a1
flower: Clear surface
2010-08-30 08:21:44 -04:00
c7c60646ad
Add options to specify xkb details
2010-08-29 21:33:39 -04:00
30620609b2
Remove debug message
2010-08-29 21:12:25 -04:00
e968f9c6b9
Provide visual feedback as to whether drop is supported
...
Change the cursor in response to target events.
2010-08-27 22:18:00 -04:00
Casey Dahlin