Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[dbus] Use constants from mde-dev instead of hard-coding. Fixes MER#1854
Move all locally defined D-Bus related constants to mce-dev.

Use only constants defined in mce-dev when setting up/handling D-Bus
method calls to mce / sending D-Bus signals from mce.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Nov 18, 2017
1 parent 13d2870 commit 8087d7d
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 115 deletions.
6 changes: 3 additions & 3 deletions mce-dbus.c
Expand Up @@ -4827,7 +4827,7 @@ static mce_dbus_handler_t mce_dbus_handlers[] =
},
{
.interface = MCE_REQUEST_IF,
.name = "get_suspend_stats",
.name = MCE_SUSPEND_STATS_GET,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = suspend_stats_get_dbus_cb,
.args =
Expand All @@ -4836,15 +4836,15 @@ static mce_dbus_handler_t mce_dbus_handlers[] =
},
{
.interface = MCE_REQUEST_IF,
.name = "get_verbosity",
.name = MCE_VERBOSITY_GET,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = verbosity_get_dbus_cb,
.args =
" <arg direction=\"out\" name=\"level\" type=\"i\"/>\n"
},
{
.interface = MCE_REQUEST_IF,
.name = "set_verbosity",
.name = MCE_VERBOSITY_REQ,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = verbosity_set_dbus_cb,
.args =
Expand Down
17 changes: 3 additions & 14 deletions modules/display.c
Expand Up @@ -101,14 +101,6 @@
/** How long to delay entering late suspend after powering down display */
#define MCE_DISPLAY_STM_SUSPEND_DELAY_NS (5LL * 1000LL * 1000LL * 1000LL)

#ifdef ENABLE_DEVEL_LOGGING
/** Strictly for debugging: D-Bus method to invoke MCE_DISPLAY_LPM_ON state */
# define MCE_DISPLAY_LPM_ON_REQ "req_display_state_lpm_on"

/** Strictly for debugging: D-Bus method to invoke MCE_DISPLAY_LPM_OFF state */
# define MCE_DISPLAY_LPM_OFF_REQ "req_display_state_lpm_off"
#endif

/** Placeholder value for unknown compositor pid */
#define COMPOSITOR_STM_INVALID_PID (-1)

Expand Down Expand Up @@ -3174,9 +3166,6 @@ static void mdy_brightness_set_on_level(gint hbm_and_level)
* UI_SIDE_DIMMING
* ========================================================================= */

/** Signal to send when ui side fader opacity changes */
#define MCE_FADER_OPACITY_SIG "fader_opacity_ind"

/** Compositor side fade to black opacity level percentage
*
* Used when backlight brightness alone can't produce visible dimmed state */
Expand Down Expand Up @@ -9258,15 +9247,15 @@ static mce_dbus_handler_t mdy_dbus_handlers[] =
#ifdef ENABLE_DEVEL_LOGGING
{
.interface = MCE_REQUEST_IF,
.name = MCE_DISPLAY_LPM_ON_REQ,
.name = MCE_DISPLAY_STATE_LPM_ON_REQ,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = mdy_dbus_handle_display_lpm_on_req,
.args =
""
},
{
.interface = MCE_REQUEST_IF,
.name = MCE_DISPLAY_LPM_OFF_REQ,
.name = MCE_DISPLAY_STATE_LPM_OFF_REQ,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = mdy_dbus_handle_display_lpm_off_req,
.args =
Expand Down Expand Up @@ -9300,7 +9289,7 @@ static mce_dbus_handler_t mdy_dbus_handlers[] =
},
{
.interface = MCE_REQUEST_IF,
.name = "get_display_stats",
.name = MCE_DISPLAY_STATS_GET,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = mdy_dbus_handle_display_stats_get_req,
.args =
Expand Down
9 changes: 5 additions & 4 deletions modules/memnotify.c
Expand Up @@ -27,6 +27,7 @@
#include "../mce-setting.h"

#include <mce/dbus-names.h>
#include <mce/mode-names.h>

#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -257,10 +258,10 @@ memnotify_level_name(memnotify_level_t lev)
{
static const char * const lut[MEMNOTIFY_LEVEL_COUNT] =
{
[MEMNOTIFY_LEVEL_NORMAL] = "normal",
[MEMNOTIFY_LEVEL_WARNING] = "warning",
[MEMNOTIFY_LEVEL_CRITICAL] = "critical",
[MEMNOTIFY_LEVEL_UNKNOWN] = "unknown",
[MEMNOTIFY_LEVEL_NORMAL] = MCE_MEMORY_LEVEL_NORMAL,
[MEMNOTIFY_LEVEL_WARNING] = MCE_MEMORY_LEVEL_WARNING,
[MEMNOTIFY_LEVEL_CRITICAL] = MCE_MEMORY_LEVEL_CRITICAL,
[MEMNOTIFY_LEVEL_UNKNOWN] = MCE_MEMORY_LEVEL_UNKNOWN,
};

return (lev < MEMNOTIFY_LEVEL_COUNT) ? lut[lev] : "undefined";
Expand Down
14 changes: 0 additions & 14 deletions modules/memnotify.h
Expand Up @@ -30,18 +30,4 @@
# define MCE_SETTING_MEMNOTIFY_CRITICAL_ACTIVE MCE_SETTING_MEMNOTIFY_PATH"/critical/active"
# define MCE_DEFAULT_MEMNOTIFY_CRITICAL_ACTIVE 0 // = disabled

/* ========================================================================= *
* D-Bus Constants
* ========================================================================= */

/** Signal that is sent when memory use level changes
*
* Has a string parameter: "normal", "warning" or "critical" (actual strings
* are defined in the memnotify_limit[] array).
*/
# define MCE_MEMORY_LEVEL_SIG "sig_memory_level_ind"

/** Query current memory level */
# define MCE_MEMORY_LEVEL_GET "get_memory_level"

#endif /* MEMNOTIFY_H_ */
7 changes: 4 additions & 3 deletions modules/sensor-gestures.c
Expand Up @@ -28,6 +28,7 @@
#include "display.h"

#include <mce/dbus-names.h>
#include <mce/mode-names.h>

#include <gmodule.h>

Expand Down Expand Up @@ -117,7 +118,7 @@ static void sg_send_flipover_signal(const char *sig)
goto EXIT;

// NOTE: introspection data shared with powerkey.c
const char *arg = "flipover";
const char *arg = MCE_FEEDBACK_EVENT_FLIPOVER;
mce_log(LL_DEVEL, "sending dbus signal: %s %s", sig, arg);
dbus_send(0, MCE_SIGNAL_PATH, MCE_SIGNAL_IF, sig, 0,
DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
Expand Down Expand Up @@ -168,10 +169,10 @@ static void sg_detect_flipover_gesture(void)
primed = false;

if( sg_have_alarm_dialog() )
sg_send_flipover_signal("alarm_ui_feedback_ind");
sg_send_flipover_signal(MCE_ALARM_UI_FEEDBACK_SIG);

if( sg_have_incoming_call() )
sg_send_flipover_signal("call_ui_feedback_ind");
sg_send_flipover_signal(MCE_CALL_UI_FEEDBACK_SIG);
}

EXIT:
Expand Down
14 changes: 7 additions & 7 deletions powerkey.c
Expand Up @@ -1607,7 +1607,7 @@ pwrkey_dbus_action_execute(size_t action_id)
}

if( pwrkey_dbus_action_is_signal(action) ) {
pwrkey_dbus_send_signal("power_button_trigger",
pwrkey_dbus_send_signal(MCE_POWER_BUTTON_TRIGGER,
action->argument);
goto cleanup;
}
Expand Down Expand Up @@ -1791,7 +1791,7 @@ pwrkey_stm_ignore_action(void)
case MCE_ALARM_UI_RINGING_INT32:
mce_log(LL_DEVEL, "[powerkey] ignored due to active alarm");
ignore_powerkey = true;
pwrkey_dbus_send_signal("alarm_ui_feedback_ind", "powerkey");
pwrkey_dbus_send_signal(MCE_ALARM_UI_FEEDBACK_SIG, MCE_FEEDBACK_EVENT_POWERKEY);
break;

default:
Expand All @@ -1812,7 +1812,7 @@ pwrkey_stm_ignore_action(void)
}
mce_log(LL_DEVEL, "[powerkey] ignored due to incoming call");
ignore_powerkey = true;
pwrkey_dbus_send_signal("call_ui_feedback_ind", "powerkey");
pwrkey_dbus_send_signal(MCE_CALL_UI_FEEDBACK_SIG, MCE_FEEDBACK_EVENT_POWERKEY);
break;

default:
Expand Down Expand Up @@ -1938,7 +1938,7 @@ homekey_stm_set_state(homekey_stm_t state)

case HOMEKEY_STM_SEND_SIGNAL:
/* Inform compositor that it should perform home key actions */
pwrkey_dbus_send_signal("power_button_trigger", "home-key");
pwrkey_dbus_send_signal(MCE_POWER_BUTTON_TRIGGER, "home-key");
break;

case HOMEKEY_STM_WAIT_RELEASE:
Expand Down Expand Up @@ -2163,21 +2163,21 @@ static mce_dbus_handler_t pwrkey_dbus_handlers[] =
/* signals - outbound (for Introspect purposes only) */
{
.interface = MCE_SIGNAL_IF,
.name = "alarm_ui_feedback_ind",
.name = MCE_ALARM_UI_FEEDBACK_SIG,
.type = DBUS_MESSAGE_TYPE_SIGNAL,
.args =
" <arg name=\"event\" type=\"s\"/>\n"
},
{
.interface = MCE_SIGNAL_IF,
.name = "call_ui_feedback_ind",
.name = MCE_CALL_UI_FEEDBACK_SIG,
.type = DBUS_MESSAGE_TYPE_SIGNAL,
.args =
" <arg name=\"event\" type=\"s\"/>\n"
},
{
.interface = MCE_SIGNAL_IF,
.name = "power_button_trigger",
.name = MCE_POWER_BUTTON_TRIGGER,
.type = DBUS_MESSAGE_TYPE_SIGNAL,
.args =
" <arg name=\"event\" type=\"s\"/>\n"
Expand Down
20 changes: 4 additions & 16 deletions systemui/tklock-dbus-names.h
Expand Up @@ -19,13 +19,13 @@
#ifndef _SYSTEMUI_TKLOCK_DBUS_NAMES_H
#define _SYSTEMUI_TKLOCK_DBUS_NAMES_H

/* TODO: These constants are related to semi-functional legacy interface
* and all of it should be removed both from mce and lipstick...
*/

#define SYSTEMUI_TKLOCK_OPEN_REQ "tklock_open"
#define SYSTEMUI_TKLOCK_CLOSE_REQ "tklock_close"

#define TKLOCK_SIGNAL_IF "com.nokia.tklock.signal"
#define TKLOCK_SIGNAL_PATH "/com/nokia/tklock/signal"
#define TKLOCK_MM_KEY_PRESS_SIG "mm_key_press"

/** Enum of modes used when calling SystemUI */
typedef enum {
/** Disable TKLock; deprecated -- use close call instead */
Expand All @@ -46,16 +46,4 @@ typedef enum {
TKLOCK_PAUSE_UI
} tklock_mode;

/** Enum of statuses received from SystemUI */
typedef enum {
/** TKLock was unlocked by the user */
TKLOCK_UNLOCK = 1,
/** TKLock unlock attempt failed; deprecated */
TKLOCK_RETRY,
/** Attempt to open TKLock timed out; deprecated */
TKLOCK_TIMEOUT,
/** TKLock closed on request from mce */
TKLOCK_CLOSED
} tklock_status;

#endif /* _SYSTEMUI_TKLOCK_DBUS_NAMES_H */
42 changes: 17 additions & 25 deletions tklock.c
Expand Up @@ -86,9 +86,6 @@ typedef enum
/** Maximum number of concurrent notification ui exceptions */
#define TKLOCK_NOTIF_SLOTS 32

/** Signal to send when lpm ui state changes */
#define MCE_LPM_UI_MODE_SIG "lpm_ui_mode_ind"

/** How long to wait for lid close after low lux [ms] */
#define TKLOCK_LIDFILTER_SET_WAIT_FOR_CLOSE_DELAY 1500

Expand Down Expand Up @@ -5555,7 +5552,8 @@ static void tklock_ui_send_lpm_signal(void)

/* then send the signal */
const char *sig = MCE_LPM_UI_MODE_SIG;
const char *arg = enabled ? "enabled" : "disabled";
const char *arg = enabled ? MCE_LPM_UI_ENABLED : MCE_LPM_UI_DISABLED;

mce_log(LL_DEVEL, "sending dbus signal: %s %s", sig, arg);
dbus_send(0, MCE_SIGNAL_PATH, MCE_SIGNAL_IF, sig, 0,
DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
Expand Down Expand Up @@ -5614,7 +5612,7 @@ static void tklock_ui_show_device_unlock(void)
* 2) having the tkunlock redirection available means that it would
* not be needed at all in the power key handler ...
*/
const char *sig = "power_button_trigger";
const char *sig = MCE_POWER_BUTTON_TRIGGER;
const char *arg = "double-power-key";
dbus_send(0, MCE_SIGNAL_PATH, MCE_SIGNAL_IF, sig, 0,
DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
Expand Down Expand Up @@ -5675,9 +5673,6 @@ tklock_dbus_display_blanking_policy_get_cb(DBusMessage *const msg)
return TRUE;
}

#define MCE_KEYBOARD_SLIDE_STATE_SIG "keyboard_slide_state_ind"
#define MCE_KEYBOARD_SLIDE_STATE_REQ "keyboard_slide_state_req"

/** Send the keyboard slide open/closed state
*
* @param req A method call message to be replied, or
Expand All @@ -5692,15 +5687,15 @@ tklock_dbus_send_keyboard_slide_state(DBusMessage *const req)
rsp = dbus_new_method_reply(req);
else
rsp = dbus_new_signal(MCE_SIGNAL_PATH, MCE_SIGNAL_IF,
MCE_KEYBOARD_SLIDE_STATE_SIG);
MCE_SLIDING_KEYBOARD_STATE_SIG);
if( !rsp )
goto EXIT;

const char *arg = "undef";
const char *arg = MCE_SLIDING_KEYBOARD_UNDEF;

switch( kbd_slide_output_state ) {
case COVER_OPEN: arg = "open"; break;
case COVER_CLOSED: arg = "closed"; break;
case COVER_OPEN: arg = MCE_SLIDING_KEYBOARD_OPEN; break;
case COVER_CLOSED: arg = MCE_SLIDING_KEYBOARD_CLOSED; break;
default: break;
}

Expand Down Expand Up @@ -5735,9 +5730,6 @@ tklock_dbus_keyboard_slide_state_get_req_cb(DBusMessage *const msg)
return TRUE;
}

#define MCE_KEYBOARD_AVAILABLE_STATE_SIG "keyboard_available_state_ind"
#define MCE_KEYBOARD_AVAILABLE_STATE_REQ "keyboard_available_state_req"

/** Send the keyboard available state
*
* @param req A method call message to be replied, or
Expand All @@ -5752,15 +5744,15 @@ tklock_dbus_send_keyboard_available_state(DBusMessage *const req)
rsp = dbus_new_method_reply(req);
else
rsp = dbus_new_signal(MCE_SIGNAL_PATH, MCE_SIGNAL_IF,
MCE_KEYBOARD_AVAILABLE_STATE_SIG);
MCE_HARDWARE_KEYBOARD_STATE_SIG);
if( !rsp )
goto EXIT;

const char *arg = "undef";
const char *arg = MCE_HARDWARE_KEYBOARD_UNDEF;

switch( kbd_available_state ) {
case COVER_OPEN: arg = "available"; break;
case COVER_CLOSED: arg = "not-available"; break;
case COVER_OPEN: arg = MCE_HARDWARE_KEYBOARD_AVAILABLE; break;
case COVER_CLOSED: arg = MCE_HARDWARE_KEYBOARD_NOT_AVAILABLE; break;
default: break;
}

Expand Down Expand Up @@ -6196,14 +6188,14 @@ static mce_dbus_handler_t tklock_dbus_handlers[] =
},
{
.interface = MCE_SIGNAL_IF,
.name = MCE_KEYBOARD_SLIDE_STATE_SIG,
.name = MCE_SLIDING_KEYBOARD_STATE_SIG,
.type = DBUS_MESSAGE_TYPE_SIGNAL,
.args =
" <arg name=\"slide_state\" type=\"s\"/>\n"
},
{
.interface = MCE_SIGNAL_IF,
.name = MCE_KEYBOARD_AVAILABLE_STATE_SIG,
.name = MCE_HARDWARE_KEYBOARD_STATE_SIG,
.type = DBUS_MESSAGE_TYPE_SIGNAL,
.args =
" <arg name=\"keyboard_state\" type=\"s\"/>\n"
Expand Down Expand Up @@ -6242,7 +6234,7 @@ static mce_dbus_handler_t tklock_dbus_handlers[] =
},
{
.interface = MCE_REQUEST_IF,
.name = "notification_begin_req",
.name = MCE_NOTIFICATION_BEGIN_REQ,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = tklock_dbus_notification_beg_cb,
.args =
Expand All @@ -6252,7 +6244,7 @@ static mce_dbus_handler_t tklock_dbus_handlers[] =
},
{
.interface = MCE_REQUEST_IF,
.name = "notification_end_req",
.name = MCE_NOTIFICATION_END_REQ,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = tklock_dbus_notification_end_cb,
.args =
Expand All @@ -6261,15 +6253,15 @@ static mce_dbus_handler_t tklock_dbus_handlers[] =
},
{
.interface = MCE_REQUEST_IF,
.name = MCE_KEYBOARD_SLIDE_STATE_REQ,
.name = MCE_SLIDING_KEYBOARD_STATE_GET,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = tklock_dbus_keyboard_slide_state_get_req_cb,
.args =
" <arg direction=\"out\" name=\"slide_state\" type=\"s\"/>\n"
},
{
.interface = MCE_REQUEST_IF,
.name = MCE_KEYBOARD_AVAILABLE_STATE_REQ,
.name = MCE_HARDWARE_KEYBOARD_STATE_GET,
.type = DBUS_MESSAGE_TYPE_METHOD_CALL,
.callback = tklock_dbus_keyboard_available_state_get_req_cb,
.args =
Expand Down

0 comments on commit 8087d7d

Please sign in to comment.