Commit Graph

61 Commits

Author SHA1 Message Date
Mike Blumenkrantz f806dae1e1 track setxkbmap processes and allow only one to run at a time
fix T5188
2017-08-25 14:47:10 -04:00
Derek Foreman 73aecd73ab Replace all timer_add with timer_loop_add
So yeah, I've literally used sed to replace every occurrence of
ecore_time_add() with ecore_timer_loop_add() because I'm reasonably
confident that no part of E has a legitimate need for timer based on the
exact current time.

It would be really nice if I'm not wrong. :)

The reason for this is the incredible spew of clock_gettime() calls I'm
seeing on an ARM system (that should have a vdso for gettime, but...)
This can amount to thousands of system calls per second.

 #YOLO
2017-02-03 15:52:28 -06:00
Carsten Haitzler 3779086a63 e icon - use new skip header async preload to make icon loads async
now they can be trule async hopefully stopping things like application
menu from stalling while loading icons header... which is really nasty
with svg's. this actually makes icons async by default which is really
EXACTLY what you want. this also prepares for later making edje loads
async.

@feature
2017-01-02 09:51:57 +09:00
Romain Naour 7720039ad1 e_xkb: add guard around skip_new_keyboard
skip_new_keyboard is not available if HAVE_WAYLAND_ONLY is defined.

Fixes:
src/bin/e_xkb.c: Dans la fonction ‘_e_x_xkb_reconfig’:
src/bin/e_xkb.c:216:4: erreur : ‘skip_new_keyboard’ undeclared (first use in this function)
    skip_new_keyboard ++;

Signed-off-by: Romain Naour <romain.naour@gmail.com>
2016-08-22 11:08:36 -04:00
Chris Michael f3371ff04c 'cur_group' variable is unused here if we are not building for wayland
Signed-off-by: Chris Michael <cp.michael@samsung.com>
2016-07-11 12:11:00 -04:00
Andy Williams 67463782a8 Fix compiling with WL off 2016-06-30 23:27:14 +01:00
Marcel Hollerbach 30b22f30af e_xkb: use the new e_comp_wl_input_index_set api
For now the setting of a new layout does not mean the complete file
needs to be recompiled.
2016-06-30 20:35:58 +02:00
Marcel Hollerbach 9c8b6a1c5d e_xkb: eval group before setted to wl
otherwise we are going to set 0 as default group.

This commit refactors out _eval_cur_group from the init timer, since wl
does not need a init timer.
2016-06-25 15:01:44 +02:00
Marcel Hollerbach a45bbe3d35 e_xkb: init the keyboard on init
we need to flush in the first group here. For wayland currently each
keyboard configuration needs to be flushed each time.
2016-06-21 21:43:57 +02:00
Marcel Hollerbach ce6d2285f1 e_xkb: split up e_xkb_update
before the function had the semantics that -1 flushes the set of layouts
back to the displayservice. Now its done with e_xkb_reconfig.
2016-05-12 20:54:22 +02:00
Mike Blumenkrantz 7db999dec1 xkb compiler warns--
ref 53636dd87c
2016-04-11 15:05:32 -04:00
Marcel Hollerbach 53636dd87c e_xkb: use new_keyboard event to restore known layout
Summary:
the new_keyboard event is now used to restore the known layouts out of
the config, if the state is changedthe new group is safed in the config
which will be safed later.

Reviewers: zmike

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D3877
2016-04-08 23:30:22 +02:00
Marcel Hollerbach 19db5f256c e_xkb: init before e_comp_wl init
for the case e_xkb gets initialized, we need to init it before ecore_drm
is called, otherwise ecore_drm will create his own context and keymap,
which will be overriden a few moment later when e_xkb is initializied.
So by calling e_comp_wl_input_keymap_set before ecore_drm_init the
correct context and keymap is set and no useless elements are created.

The mainproblem is that the comp_type is set when the compositor is
already running, so we have to pass the type at the init to the e_xkb
to tell for which kind of compositor we are running.
2016-03-24 20:54:03 +01:00
Marcel Hollerbach 7cfb6f3d3f e_comp_wl: remove useless params from keymap_set 2016-03-24 20:54:03 +01:00
Marcel Hollerbach ce9339a4ac e_xkb: configure model and a list of layouts variants and options to use
the e_comp_wl function takes a list of layouts variants and options
which should be generated from the configured.
2016-03-24 20:54:03 +01:00
Marcel Hollerbach 3677ff12f9 e_xkb: refactor command creation code
-model was set to default if e_config->xkb.default_model was default.
Fix this and always set e_config->xkb.default_model.
2016-03-24 20:54:03 +01:00
Chris Michael 18a9c2d97d add #else to #if 0'd block in order to avoid compiler warning about
unused variable.

Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
2016-03-24 10:33:47 -04:00
Chris Michael 83a9e4a404 Reverting this commit to handle a better way
Revert "add EINA_UNUSED for unused function parameter"

This reverts commit 59c0e7f586.
2016-03-24 10:32:52 -04:00
Chris Michael 59c0e7f586 add EINA_UNUSED for unused function parameter
As the block which uses this parameter is #if 0'd out, we end up not
using this param, which generates a compiler warning

Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
2016-03-24 10:14:33 -04:00
Marcel Hollerbach f01b8d76e7 add skip event counter for xkb events
if we are setting the group or the set of groups in e we will receive a
XkbNotifyState Event from x, which will result in a
ECORE_X_EVENT_XKB_STATE_NOTIFY event. We are setting there again our
settings, since we need to reset the settings from a potential external
application. So we should only reset our settings when the event is not
expected by e.
2016-03-21 11:33:15 -04:00
Marcel Hollerbach 24487c5233 re-apply xkb layout groups whenever an xkb event occurs
If someone plugs in a external monitor, the notify event is set AND the
group is changed externally. This means enlightenment cannot configure a
new keyboard anymore. So we are flushing in our new config all the time,
setting the old group-index again.
2016-03-21 11:31:58 -04:00
Chris Michael 01ae2a6287 fix compiler warning about comparison between signed and unsigned ints
Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
2016-01-20 15:10:36 -05:00
Marcel Hollerbach 8b2eb6fb8b e_xkb: emit changed event if ECORE_X_EVENT_XKB_STATE_NOTIFY is emitted 2016-01-18 22:14:45 +01:00
Marcel Hollerbach 7e74ad229c e_xkb: emit changed event if wayland keyboard has changed 2016-01-18 22:14:45 +01:00
Marcel Hollerbach 35ae02a524 e_xkb: implement keyboard setting on wayland.
this splits e_xkb_update into a update function for wayland and x. The
matching function to the compositor type is called.

@feature
2016-01-14 18:37:27 +01:00
Mike Blumenkrantz f1faab997f only init E_EVENT_XKB_CHANGED during xkb init if xkb init hasn't already occurred
allows xkb init to be called repeatedly
2015-09-22 14:16:20 -04:00
Mike Blumenkrantz 8b932b053e update xkb settings and send xkb update event when calling e_xkb_layout_set()
resolves issue where setting a specific kbd would fail to make settings permanent
as well as not propagating the kbd change to the rest of enlightenment

fix T1810
2015-09-22 13:44:18 -04:00
Chris Michael bf19cdf337 correctly fix check for x11 compositor in e_xkb
Signed-off-by: Chris Michael <cp.michael@samsung.com>
2015-07-01 12:23:40 -04:00
Chris Michael e94a04eddc Don't call ecore_x_xkb_select_group if the compositor is not X11
This fixes T2533 where the startup wizard would crash when run under
DRM due to the change in build options (xwayland support).

Signed-off-by: Chris Michael <cp.michael@samsung.com>
2015-07-01 09:16:18 -04:00
Mike Blumenkrantz f832640f18 block xkb activation for non-X11 compositors 2015-06-25 20:11:54 -04:00
Chris Michael 0a94e8ba71 enlightenment: Make E build again with EFL from git
sed -i 's/EAPI/E_API/g'

Signed-off-by: Chris Michael <cp.michael@samsung.com>
2015-05-07 15:13:10 -04:00
Mike Blumenkrantz 05d09f7c51 null check xkb layout list
CID 1039869
2014-04-04 15:04:28 -04:00
Mike Blumenkrantz c04d754ac5 enabling drm output module should NOT require X-less build.
these defines all need to be changed from HAVE_WAYLAND_ONLY to something like WITH_X or we're going to have lots of problems with xwayland later on
2014-03-18 16:14:04 -04:00
Chris Michael 915f8f0613 @bugfix: Fix building for WAYLAND_ONLY by using the proper define
sed -i 's/WAYLAND_ONLY/HAVE_WAYLAND_ONLY/g'

Signed-off-by: Chris Michael <cp.michael@samsung.com>
2014-03-18 07:43:04 +00:00
Mike Blumenkrantz 893b867070 add option for disabling all keyboard layout changes
SVN revision: 83674
2013-02-06 10:51:54 +00:00
Mike Blumenkrantz 3fa4115633 same xkb typo in another place
SVN revision: 83540
2013-02-01 08:24:22 +00:00
Mike Blumenkrantz 9c847e9d7f fix xkb crash
SVN revision: 83539
2013-02-01 07:48:19 +00:00
Mike Blumenkrantz 57933c9d02 giant rollup commit fixing all xkb issues
tickets #1799, #2082


SVN revision: 83531
2013-01-31 17:50:45 +00:00
Mike Blumenkrantz a4d35ff86c fix flag reduce case for when name has no / character
SVN revision: 83530
2013-01-31 17:24:31 +00:00
Mike Blumenkrantz 98bb1620f7 make one of the xkb functions less stupid
SVN revision: 83526
2013-01-31 16:07:45 +00:00
Mike Blumenkrantz a5a068a358 fix xkb variant construction, patch from Tomas Cech
ticket #2119


SVN revision: 81849
2012-12-28 22:35:10 +00:00
Mike Blumenkrantz 68e80049c7 improve xkb init: don't call setxkbmap more than once, wait a short while on a timer before setting the layout group to (hopefully) ensure that setxkbmap has completed before trying to set the group number
SVN revision: 81430
2012-12-20 09:27:35 +00:00
Mike Blumenkrantz a8143270cd always re-set xmodmap after changing kbd layout group
SVN revision: 80761
2012-12-12 13:31:18 +00:00
Carsten Haitzler 6c466cd6f3 stderr for the run cmd so we can debug and stuff...
SVN revision: 79529
2012-11-22 01:27:03 +00:00
Mike Blumenkrantz 031624abd9 xkb no longer sets dummy default layouts and is smarter about applying configs without layouts
SVN revision: 79141
2012-11-12 09:49:07 +00:00
Mike Blumenkrantz e32b918e43 send xkb update event any time e_xkb_update() is called with a real value
SVN revision: 77728
2012-10-10 09:06:21 +00:00
Mike Blumenkrantz 0521c799fa next/prev xkb layout switch actions now properly set the current/selected kbd layout name
SVN revision: 77369
2012-10-03 13:46:11 +00:00
Mike Blumenkrantz b247496406 ton of xkb fixes:
* e will no longer lose your currently selected layout on restart
* desklock layout switching now works real güd
* new e_config values to determine current and current user-selected kbd layout
* wasted my entire morning doing this

ticket #1538



SVN revision: 77356
2012-10-03 09:00:12 +00:00
Mike Blumenkrantz 74909a465b formatting
SVN revision: 77313
2012-10-02 12:14:53 +00:00
Mike Blumenkrantz 42c7aa5975 avoid setting xkb variant as ',', just set as '' instead
SVN revision: 77311
2012-10-02 12:12:03 +00:00