fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: move and rename TermColor and TermFormat

Browse source
This commit is contained in:
Thomas Haller 2017-04-04 15:12:00 +02:00
parent e3a07633dc
commit ca0e749c40
10 changed files with 124 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
clients/cli/connections.c
View file

@ -861,16 +861,16 @@ found:
} }
void void
nmc_active_connection_state_to_color (NMActiveConnectionState state, NmcTermColor *color) nmc_active_connection_state_to_color (NMActiveConnectionState state, NMMetaTermColor *color)
{ {
*color = NMC_TERM_COLOR_NORMAL; *color = NM_META_TERM_COLOR_NORMAL;
if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING)
*color = NMC_TERM_COLOR_YELLOW; *color = NM_META_TERM_COLOR_YELLOW;
else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED)
*color = NMC_TERM_COLOR_GREEN; *color = NM_META_TERM_COLOR_GREEN;
else if (state > NM_ACTIVE_CONNECTION_STATE_ACTIVATED) else if (state > NM_ACTIVE_CONNECTION_STATE_ACTIVATED)
*color = NMC_TERM_COLOR_RED; *color = NM_META_TERM_COLOR_RED;
} }
static void static void
@ -888,7 +888,7 @@ fill_output_connection (NMConnection *connection, NMClient *client, GPtrArray *o
const char *ac_state = NULL; const char *ac_state = NULL;
NMActiveConnectionState ac_state_int = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; NMActiveConnectionState ac_state_int = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
char *ac_dev = NULL; char *ac_dev = NULL;
NmcTermColor color; NMMetaTermColor color;
s_con = nm_connection_get_setting_connection (connection); s_con = nm_connection_get_setting_connection (connection);
g_assert (s_con); g_assert (s_con);
@ -968,7 +968,7 @@ fill_output_connection_for_invisible (NMActiveConnection *ac, GPtrArray *output_
set_val_strc (arr, 12, ac_path); set_val_strc (arr, 12, ac_path);
set_val_strc (arr, 13, NULL); set_val_strc (arr, 13, NULL);
set_val_color_fmt_all (arr, NMC_TERM_FORMAT_DIM); set_val_color_fmt_all (arr, NM_META_TERM_FORMAT_DIM);
g_ptr_array_add (output_data, arr); g_ptr_array_add (output_data, arr);
} }
@ -6568,7 +6568,7 @@ property_edit_submenu (NmCli *nmc,
/* Set global variable for use in TAB completion */ /* Set global variable for use in TAB completion */
nmc_tab_completion.property = prop_name; nmc_tab_completion.property = prop_name;
prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NMC_TERM_FORMAT_NORMAL, prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL,
"nmcli %s.%s> ", "nmcli %s.%s> ",
nm_setting_get_name (curr_setting), prop_name); nm_setting_get_name (curr_setting), prop_name);
@ -6907,11 +6907,11 @@ static void
menu_switch_to_level0 (NmcColorOption color_option, menu_switch_to_level0 (NmcColorOption color_option,
NmcEditorMenuContext *menu_ctx, NmcEditorMenuContext *menu_ctx,
const char *prompt, const char *prompt,
NmcTermColor prompt_color) NMMetaTermColor prompt_color)
{ {
menu_ctx->level = 0; menu_ctx->level = 0;
g_free (menu_ctx->main_prompt); g_free (menu_ctx->main_prompt);
menu_ctx->main_prompt = nmc_colorize (color_option, prompt_color, NMC_TERM_FORMAT_NORMAL, "%s", prompt); menu_ctx->main_prompt = nmc_colorize (color_option, prompt_color, NM_META_TERM_FORMAT_NORMAL, "%s", prompt);
menu_ctx->curr_setting = NULL; menu_ctx->curr_setting = NULL;
g_strfreev (menu_ctx->valid_props); g_strfreev (menu_ctx->valid_props);
menu_ctx->valid_props = NULL; menu_ctx->valid_props = NULL;
@ -6924,11 +6924,11 @@ menu_switch_to_level1 (NmcColorOption color_option,
NmcEditorMenuContext *menu_ctx, NmcEditorMenuContext *menu_ctx,
NMSetting *setting, NMSetting *setting,
const char *setting_name, const char *setting_name,
NmcTermColor prompt_color) NMMetaTermColor prompt_color)
{ {
menu_ctx->level = 1; menu_ctx->level = 1;
g_free (menu_ctx->main_prompt); g_free (menu_ctx->main_prompt);
menu_ctx->main_prompt = nmc_colorize (color_option, prompt_color, NMC_TERM_FORMAT_NORMAL, menu_ctx->main_prompt = nmc_colorize (color_option, prompt_color, NM_META_TERM_FORMAT_NORMAL,
"nmcli %s> ", setting_name); "nmcli %s> ", setting_name);
menu_ctx->curr_setting = setting; menu_ctx->curr_setting = setting;
g_strfreev (menu_ctx->valid_props); g_strfreev (menu_ctx->valid_props);
@ -6974,7 +6974,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
g_print (_("You may edit the following settings: %s\n"), valid_settings_str); g_print (_("You may edit the following settings: %s\n"), valid_settings_str);
menu_ctx.level = 0; menu_ctx.level = 0;
menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NMC_TERM_FORMAT_NORMAL, menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL,
BASE_PROMPT); BASE_PROMPT);
menu_ctx.curr_setting = NULL; menu_ctx.curr_setting = NULL;
menu_ctx.valid_props = NULL; menu_ctx.valid_props = NULL;
@ -7647,7 +7647,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
nmc->editor_show_secrets = bb; nmc->editor_show_secrets = bb;
} else if (cmd_arg_p && matches (cmd_arg_p, "prompt-color")) { } else if (cmd_arg_p && matches (cmd_arg_p, "prompt-color")) {
GError *tmp_err = NULL; GError *tmp_err = NULL;
NmcTermColor color; NMMetaTermColor color;
color = nmc_term_color_parse_string (cmd_arg_v ? g_strstrip (cmd_arg_v) : " ", &tmp_err); color = nmc_term_color_parse_string (cmd_arg_v ? g_strstrip (cmd_arg_v) : " ", &tmp_err);
if (tmp_err) { if (tmp_err) {
g_print (_("Error: bad color: %s\n"), tmp_err->message); g_print (_("Error: bad color: %s\n"), tmp_err->message);
@ -7656,10 +7656,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
nmc->editor_prompt_color = color; nmc->editor_prompt_color = color;
g_free (menu_ctx.main_prompt); g_free (menu_ctx.main_prompt);
if (menu_ctx.level == 0) if (menu_ctx.level == 0)
menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NMC_TERM_FORMAT_NORMAL, menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL,
BASE_PROMPT); BASE_PROMPT);
else else
menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NMC_TERM_FORMAT_NORMAL, menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL,
"nmcli %s> ", "nmcli %s> ",
nm_setting_get_name (menu_ctx.curr_setting)); nm_setting_get_name (menu_ctx.curr_setting));
} }

2
clients/cli/connections.h
View file

@ -33,7 +33,7 @@ nmc_read_connection_properties (NmCli *nmc,
char ***argv, char ***argv,
GError **error); GError **error);
void nmc_active_connection_state_to_color (NMActiveConnectionState state, NmcTermColor *color); void nmc_active_connection_state_to_color (NMActiveConnectionState state, NMMetaTermColor *color);
extern const NmcMetaGenericInfo *const nmc_fields_con_show[]; extern const NmcMetaGenericInfo *const nmc_fields_con_show[];
extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[]; extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[];

44
clients/cli/devices.c
View file

@ -658,21 +658,21 @@ sort_access_points (const GPtrArray *aps)
} }
static void static void
wifi_signal_to_color (guint8 strength, NmcTermColor *color, NmcTermFormat *color_fmt) wifi_signal_to_color (guint8 strength, NMMetaTermColor *color, NMMetaTermFormat *color_fmt)
{ {
*color = NMC_TERM_COLOR_NORMAL; *color = NM_META_TERM_COLOR_NORMAL;
*color_fmt = NMC_TERM_FORMAT_NORMAL; *color_fmt = NM_META_TERM_FORMAT_NORMAL;
if (strength > 80) if (strength > 80)
*color = NMC_TERM_COLOR_GREEN; *color = NM_META_TERM_COLOR_GREEN;
else if (strength > 55) else if (strength > 55)
*color = NMC_TERM_COLOR_YELLOW; *color = NM_META_TERM_COLOR_YELLOW;
else if (strength > 30) else if (strength > 30)
*color = NMC_TERM_COLOR_MAGENTA; *color = NM_META_TERM_COLOR_MAGENTA;
else if (strength > 5) else if (strength > 5)
*color = NMC_TERM_COLOR_CYAN; *color = NM_META_TERM_COLOR_CYAN;
else else
*color_fmt = NMC_TERM_FORMAT_DIM; *color_fmt = NM_META_TERM_FORMAT_DIM;
} }
static char * static char *
@ -745,8 +745,8 @@ fill_output_access_point (gpointer data, gpointer user_data)
GString *security_str; GString *security_str;
char *ap_name; char *ap_name;
const char *sig_bars; const char *sig_bars;
NmcTermColor color; NMMetaTermColor color;
NmcTermFormat color_fmt; NMMetaTermFormat color_fmt;
if (info->active_bssid) { if (info->active_bssid) {
const char *current_bssid = nm_access_point_get_bssid (ap); const char *current_bssid = nm_access_point_get_bssid (ap);
@ -836,7 +836,7 @@ fill_output_access_point (gpointer data, gpointer user_data)
set_val_color_all (arr, color); set_val_color_all (arr, color);
set_val_color_fmt_all (arr, color_fmt); set_val_color_fmt_all (arr, color_fmt);
if (active) if (active)
arr[15].color = NMC_TERM_COLOR_GREEN; arr[15].color = NM_META_TERM_COLOR_GREEN;
g_ptr_array_add (info->output_data, arr); g_ptr_array_add (info->output_data, arr);
@ -1413,19 +1413,19 @@ show_device_info (NMDevice *device, NmCli *nmc)
} }
void void
nmc_device_state_to_color (NMDeviceState state, NmcTermColor *color, NmcTermFormat *color_fmt) nmc_device_state_to_color (NMDeviceState state, NMMetaTermColor *color, NMMetaTermFormat *color_fmt)
{ {
*color = NMC_TERM_COLOR_NORMAL; *color = NM_META_TERM_COLOR_NORMAL;
*color_fmt = NMC_TERM_FORMAT_NORMAL; *color_fmt = NM_META_TERM_FORMAT_NORMAL;
if (state <= NM_DEVICE_STATE_UNAVAILABLE) if (state <= NM_DEVICE_STATE_UNAVAILABLE)
*color_fmt= NMC_TERM_FORMAT_DIM; *color_fmt= NM_META_TERM_FORMAT_DIM;
else if (state == NM_DEVICE_STATE_DISCONNECTED) else if (state == NM_DEVICE_STATE_DISCONNECTED)
*color = NMC_TERM_COLOR_RED; *color = NM_META_TERM_COLOR_RED;
else if (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_SECONDARIES) else if (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_SECONDARIES)
*color = NMC_TERM_COLOR_YELLOW; *color = NM_META_TERM_COLOR_YELLOW;
else if (state == NM_DEVICE_STATE_ACTIVATED) else if (state == NM_DEVICE_STATE_ACTIVATED)
*color = NMC_TERM_COLOR_GREEN; *color = NM_META_TERM_COLOR_GREEN;
} }
static void static void
@ -1433,8 +1433,8 @@ fill_output_device_status (NMDevice *device, GPtrArray *output_data)
{ {
NMActiveConnection *ac; NMActiveConnection *ac;
NMDeviceState state; NMDeviceState state;
NmcTermColor color; NMMetaTermColor color;
NmcTermFormat color_fmt; NMMetaTermFormat color_fmt;
NmcOutputField *arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_status, NmcOutputField *arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_status,
0); 0);
@ -2355,8 +2355,8 @@ static void
device_state (NMDevice *device, GParamSpec *pspec, NmCli *nmc) device_state (NMDevice *device, GParamSpec *pspec, NmCli *nmc)
{ {
NMDeviceState state = nm_device_get_state (device); NMDeviceState state = nm_device_get_state (device);
NmcTermColor color; NMMetaTermColor color;
NmcTermFormat color_fmt; NMMetaTermFormat color_fmt;
char *str; char *str;
nmc_device_state_to_color (state, &color, &color_fmt); nmc_device_state_to_color (state, &color, &color_fmt);

2
clients/cli/devices.h
View file

@ -32,7 +32,7 @@ void monitor_devices (NmCli *nmc);
NMDevice ** nmc_get_devices_sorted (NMClient *client); NMDevice ** nmc_get_devices_sorted (NMClient *client);
void nmc_device_state_to_color (NMDeviceState state, NmcTermColor *color, NmcTermFormat *color_fmt); void nmc_device_state_to_color (NMDeviceState state, NMMetaTermColor *color, NMMetaTermFormat *color_fmt);
extern const NmcMetaGenericInfo *const nmc_fields_dev_status[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_status[];
extern const NmcMetaGenericInfo *const nmc_fields_dev_show_general[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_general[];

54
clients/cli/general.c
View file

@ -254,23 +254,23 @@ nm_state_to_string (NMState state)
} }
} }
static NmcTermColor static NMMetaTermColor
state_to_color (NMState state) state_to_color (NMState state)
{ {
switch (state) { switch (state) {
case NM_STATE_CONNECTING: case NM_STATE_CONNECTING:
return NMC_TERM_COLOR_YELLOW; return NM_META_TERM_COLOR_YELLOW;
case NM_STATE_CONNECTED_LOCAL: case NM_STATE_CONNECTED_LOCAL:
case NM_STATE_CONNECTED_SITE: case NM_STATE_CONNECTED_SITE:
case NM_STATE_CONNECTED_GLOBAL: case NM_STATE_CONNECTED_GLOBAL:
return NMC_TERM_COLOR_GREEN; return NM_META_TERM_COLOR_GREEN;
case NM_STATE_DISCONNECTING: case NM_STATE_DISCONNECTING:
return NMC_TERM_COLOR_YELLOW; return NM_META_TERM_COLOR_YELLOW;
case NM_STATE_ASLEEP: case NM_STATE_ASLEEP:
case NM_STATE_DISCONNECTED: case NM_STATE_DISCONNECTED:
return NMC_TERM_COLOR_RED; return NM_META_TERM_COLOR_RED;
default: default:
return NMC_TERM_COLOR_NORMAL; return NM_META_TERM_COLOR_NORMAL;
} }
} }
@ -292,19 +292,19 @@ nm_connectivity_to_string (NMConnectivityState connectivity)
} }
} }
static NmcTermColor static NMMetaTermColor
connectivity_to_color (NMConnectivityState connectivity) connectivity_to_color (NMConnectivityState connectivity)
{ {
switch (connectivity) { switch (connectivity) {
case NM_CONNECTIVITY_NONE: case NM_CONNECTIVITY_NONE:
return NMC_TERM_COLOR_RED; return NM_META_TERM_COLOR_RED;
case NM_CONNECTIVITY_PORTAL: case NM_CONNECTIVITY_PORTAL:
case NM_CONNECTIVITY_LIMITED: case NM_CONNECTIVITY_LIMITED:
return NMC_TERM_COLOR_YELLOW; return NM_META_TERM_COLOR_YELLOW;
case NM_CONNECTIVITY_FULL: case NM_CONNECTIVITY_FULL:
return NMC_TERM_COLOR_GREEN; return NM_META_TERM_COLOR_GREEN;
default: default:
return NMC_TERM_COLOR_NORMAL; return NM_META_TERM_COLOR_NORMAL;
} }
} }
@ -368,13 +368,13 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl
/* Set colors */ /* Set colors */
arr[2].color = state_to_color (state); arr[2].color = state_to_color (state);
arr[3].color = startup ? NMC_TERM_COLOR_YELLOW : NMC_TERM_COLOR_GREEN; arr[3].color = startup ? NM_META_TERM_COLOR_YELLOW : NM_META_TERM_COLOR_GREEN;
arr[4].color = connectivity_to_color (connectivity); arr[4].color = connectivity_to_color (connectivity);
arr[5].color = net_enabled ? NMC_TERM_COLOR_GREEN : NMC_TERM_COLOR_RED; arr[5].color = net_enabled ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED;
arr[6].color = wireless_hw_enabled ? NMC_TERM_COLOR_GREEN : NMC_TERM_COLOR_RED; arr[6].color = wireless_hw_enabled ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED;
arr[7].color = wireless_enabled ? NMC_TERM_COLOR_GREEN : NMC_TERM_COLOR_RED; arr[7].color = wireless_enabled ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED;
arr[8].color = wwan_hw_enabled ? NMC_TERM_COLOR_GREEN : NMC_TERM_COLOR_RED; arr[8].color = wwan_hw_enabled ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED;
arr[9].color = wwan_enabled ? NMC_TERM_COLOR_GREEN : NMC_TERM_COLOR_RED; arr[9].color = wwan_enabled ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED;
g_ptr_array_add (out.output_data, arr); g_ptr_array_add (out.output_data, arr);
@ -1033,8 +1033,8 @@ networkmanager_running (NMClient *client, GParamSpec *param, NmCli *nmc)
running = nm_client_get_nm_running (client); running = nm_client_get_nm_running (client);
str = nmc_colorize (nmc->nmc_config.use_colors, str = nmc_colorize (nmc->nmc_config.use_colors,
running ? NMC_TERM_COLOR_GREEN : NMC_TERM_COLOR_RED, running ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED,
NMC_TERM_FORMAT_NORMAL, NM_META_TERM_FORMAT_NORMAL,
running ? _("NetworkManager has started") : _("NetworkManager has stopped")); running ? _("NetworkManager has started") : _("NetworkManager has stopped"));
g_print ("%s\n", str); g_print ("%s\n", str);
g_free (str); g_free (str);
@ -1074,7 +1074,7 @@ client_connectivity (NMClient *client, GParamSpec *param, NmCli *nmc)
char *str; char *str;
g_object_get (client, NM_CLIENT_CONNECTIVITY, &connectivity, NULL); g_object_get (client, NM_CLIENT_CONNECTIVITY, &connectivity, NULL);
str = nmc_colorize (nmc->nmc_config.use_colors, connectivity_to_color (connectivity), NMC_TERM_FORMAT_NORMAL, str = nmc_colorize (nmc->nmc_config.use_colors, connectivity_to_color (connectivity), NM_META_TERM_FORMAT_NORMAL,
_("Connectivity is now '%s'\n"), nm_connectivity_to_string (connectivity)); _("Connectivity is now '%s'\n"), nm_connectivity_to_string (connectivity));
g_print ("%s", str); g_print ("%s", str);
g_free (str); g_free (str);
@ -1087,7 +1087,7 @@ client_state (NMClient *client, GParamSpec *param, NmCli *nmc)
char *str; char *str;
g_object_get (client, NM_CLIENT_STATE, &state, NULL); g_object_get (client, NM_CLIENT_STATE, &state, NULL);
str = nmc_colorize (nmc->nmc_config.use_colors, state_to_color (state), NMC_TERM_FORMAT_NORMAL, str = nmc_colorize (nmc->nmc_config.use_colors, state_to_color (state), NM_META_TERM_FORMAT_NORMAL,
_("Networkmanager is now in the '%s' state\n"), _("Networkmanager is now in the '%s' state\n"),
nm_state_to_string (state)); nm_state_to_string (state));
g_print ("%s", str); g_print ("%s", str);
@ -1131,12 +1131,12 @@ device_overview (NmCli *nmc, NMDevice *device)
if (!nm_device_get_autoconnect (device)) if (!nm_device_get_autoconnect (device))
g_string_append_printf (outbuf, "%s, ", _("autoconnect")); g_string_append_printf (outbuf, "%s, ", _("autoconnect"));
if (nm_device_get_firmware_missing (device)) { if (nm_device_get_firmware_missing (device)) {
tmp = nmc_colorize (nmc->nmc_config.use_colors, NMC_TERM_COLOR_RED, NMC_TERM_FORMAT_NORMAL, _("fw missing")); tmp = nmc_colorize (nmc->nmc_config.use_colors, NM_META_TERM_COLOR_RED, NM_META_TERM_FORMAT_NORMAL, _("fw missing"));
g_string_append_printf (outbuf, "%s, ", tmp); g_string_append_printf (outbuf, "%s, ", tmp);
g_free (tmp); g_free (tmp);
} }
if (nm_device_get_nm_plugin_missing (device)) { if (nm_device_get_nm_plugin_missing (device)) {
tmp = nmc_colorize (nmc->nmc_config.use_colors, NMC_TERM_COLOR_RED, NMC_TERM_FORMAT_NORMAL, _("plugin missing")); tmp = nmc_colorize (nmc->nmc_config.use_colors, NM_META_TERM_COLOR_RED, NM_META_TERM_FORMAT_NORMAL, _("plugin missing"));
g_string_append_printf (outbuf, "%s, ", tmp); g_string_append_printf (outbuf, "%s, ", tmp);
g_free (tmp); g_free (tmp);
} }
@ -1237,7 +1237,7 @@ do_overview (NmCli *nmc, int argc, char **argv)
NMDevice **devices; NMDevice **devices;
const GPtrArray *p; const GPtrArray *p;
NMActiveConnection *ac; NMActiveConnection *ac;
NmcTermColor color; NMMetaTermColor color;
NMDnsEntry *dns; NMDnsEntry *dns;
char *tmp; char *tmp;
int i; int i;
@ -1259,7 +1259,7 @@ do_overview (NmCli *nmc, int argc, char **argv)
state = nm_active_connection_get_state (ac); state = nm_active_connection_get_state (ac);
nmc_active_connection_state_to_color (state, &color); nmc_active_connection_state_to_color (state, &color);
tmp = nmc_colorize (nmc->nmc_config.use_colors, color, NMC_TERM_FORMAT_NORMAL, _("%s VPN connection"), tmp = nmc_colorize (nmc->nmc_config.use_colors, color, NM_META_TERM_FORMAT_NORMAL, _("%s VPN connection"),
nm_active_connection_get_id (ac)); nm_active_connection_get_id (ac));
g_print ("%s\n", tmp); g_print ("%s\n", tmp);
g_free (tmp); g_free (tmp);
@ -1270,7 +1270,7 @@ do_overview (NmCli *nmc, int argc, char **argv)
devices = nmc_get_devices_sorted (nmc->client); devices = nmc_get_devices_sorted (nmc->client);
for (i = 0; devices[i]; i++) { for (i = 0; devices[i]; i++) {
NmcTermFormat color_fmt; NMMetaTermFormat color_fmt;
NMDeviceState state; NMDeviceState state;
ac = nm_device_get_active_connection (devices[i]); ac = nm_device_get_active_connection (devices[i]);
@ -1361,7 +1361,7 @@ do_monitor (NmCli *nmc, int argc, char **argv)
if (!nm_client_get_nm_running (nmc->client)) { if (!nm_client_get_nm_running (nmc->client)) {
char *str; char *str;
str = nmc_colorize (nmc->nmc_config.use_colors, NMC_TERM_COLOR_RED, NMC_TERM_FORMAT_NORMAL, str = nmc_colorize (nmc->nmc_config.use_colors, NM_META_TERM_COLOR_RED, NM_META_TERM_FORMAT_NORMAL,
_("Networkmanager is not running (waiting for it)\n")); _("Networkmanager is not running (waiting for it)\n"));
g_print ("%s", str); g_print ("%s", str);
g_free (str); g_free (str);

2
clients/cli/nmcli.c
View file

@ -544,7 +544,7 @@ nmc_init (NmCli *nmc)
nmc->editor_status_line = FALSE; nmc->editor_status_line = FALSE;
nmc->editor_save_confirmation = TRUE; nmc->editor_save_confirmation = TRUE;
nmc->editor_show_secrets = FALSE; nmc->editor_show_secrets = FALSE;
nmc->editor_prompt_color = NMC_TERM_COLOR_NORMAL; nmc->editor_prompt_color = NM_META_TERM_COLOR_NORMAL;
} }
static void static void

28
clients/cli/nmcli.h
View file

@ -71,28 +71,6 @@ typedef enum {
NMC_RESULT_COMPLETE_FILE = 65, NMC_RESULT_COMPLETE_FILE = 65,
} NMCResultCode; } NMCResultCode;
typedef enum {
NMC_TERM_COLOR_NORMAL = 0,
NMC_TERM_COLOR_BLACK = 1,
NMC_TERM_COLOR_RED = 2,
NMC_TERM_COLOR_GREEN = 3,
NMC_TERM_COLOR_YELLOW = 4,
NMC_TERM_COLOR_BLUE = 5,
NMC_TERM_COLOR_MAGENTA = 6,
NMC_TERM_COLOR_CYAN = 7,
NMC_TERM_COLOR_WHITE = 8
} NmcTermColor;
typedef enum {
NMC_TERM_FORMAT_NORMAL,
NMC_TERM_FORMAT_BOLD,
NMC_TERM_FORMAT_DIM,
NMC_TERM_FORMAT_UNDERLINE,
NMC_TERM_FORMAT_BLINK,
NMC_TERM_FORMAT_REVERSE,
NMC_TERM_FORMAT_HIDDEN,
} NmcTermFormat;
typedef enum { typedef enum {
NMC_PRINT_TERSE = 0, NMC_PRINT_TERSE = 0,
NMC_PRINT_NORMAL = 1, NMC_PRINT_NORMAL = 1,
@ -120,8 +98,8 @@ struct _NmcOutputField {
gboolean value_is_array; /* Whether value is char** instead of char* */ gboolean value_is_array; /* Whether value is char** instead of char* */
gboolean free_value; /* Whether to free the value */ gboolean free_value; /* Whether to free the value */
NmcOfFlags flags; /* Flags - whether and how to print values/field names/headers */ NmcOfFlags flags; /* Flags - whether and how to print values/field names/headers */
NmcTermColor color; /* Use this color to print value */ NMMetaTermColor color; /* Use this color to print value */
NmcTermFormat color_fmt; /* Use this terminal format to print value */ NMMetaTermFormat color_fmt; /* Use this terminal format to print value */
}; };
typedef enum { typedef enum {
@ -169,7 +147,7 @@ typedef struct _NmCli {
gboolean editor_status_line; /* Whether to display status line in connection editor */ gboolean editor_status_line; /* Whether to display status line in connection editor */
gboolean editor_save_confirmation; /* Whether to ask for confirmation on saving connections with 'autoconnect=yes' */ gboolean editor_save_confirmation; /* Whether to ask for confirmation on saving connections with 'autoconnect=yes' */
gboolean editor_show_secrets; /* Whether to display secrets in the editor' */ gboolean editor_show_secrets; /* Whether to display secrets in the editor' */
NmcTermColor editor_prompt_color; /* Color of prompt in connection editor */ NMMetaTermColor editor_prompt_color; /* Color of prompt in connection editor */
} NmCli; } NmCli;
extern NmCli nm_cli; extern NmCli nm_cli;

50
clients/cli/utils.c
View file

@ -334,31 +334,31 @@ nmc_terminal_show_progress (const char *str)
} }
const char * const char *
nmc_term_color_sequence (NmcTermColor color) nmc_term_color_sequence (NMMetaTermColor color)
{ {
switch (color) { switch (color) {
case NMC_TERM_COLOR_BLACK: case NM_META_TERM_COLOR_BLACK:
return "\33[30m"; return "\33[30m";
break; break;
case NMC_TERM_COLOR_RED: case NM_META_TERM_COLOR_RED:
return "\33[31m"; return "\33[31m";
break; break;
case NMC_TERM_COLOR_GREEN: case NM_META_TERM_COLOR_GREEN:
return "\33[32m"; return "\33[32m";
break; break;
case NMC_TERM_COLOR_YELLOW: case NM_META_TERM_COLOR_YELLOW:
return "\33[33m"; return "\33[33m";
break; break;
case NMC_TERM_COLOR_BLUE: case NM_META_TERM_COLOR_BLUE:
return "\33[34m"; return "\33[34m";
break; break;
case NMC_TERM_COLOR_MAGENTA: case NM_META_TERM_COLOR_MAGENTA:
return "\33[35m"; return "\33[35m";
break; break;
case NMC_TERM_COLOR_CYAN: case NM_META_TERM_COLOR_CYAN:
return "\33[36m"; return "\33[36m";
break; break;
case NMC_TERM_COLOR_WHITE: case NM_META_TERM_COLOR_WHITE:
return "\33[37m"; return "\33[37m";
break; break;
default: default:
@ -368,7 +368,7 @@ nmc_term_color_sequence (NmcTermColor color)
} }
/* Parses @str for color as string or number */ /* Parses @str for color as string or number */
NmcTermColor NMMetaTermColor
nmc_term_color_parse_string (const char *str, GError **error) nmc_term_color_parse_string (const char *str, GError **error)
{ {
unsigned long color_int; unsigned long color_int;
@ -376,7 +376,7 @@ nmc_term_color_parse_string (const char *str, GError **error)
"blue", "magenta", "cyan", "white", NULL }; "blue", "magenta", "cyan", "white", NULL };
if (nmc_string_to_uint (str, TRUE, 0, 8, &color_int)) { if (nmc_string_to_uint (str, TRUE, 0, 8, &color_int)) {
return (NmcTermColor) color_int; return (NMMetaTermColor) color_int;
} else { } else {
const char *color, **p; const char *color, **p;
int i; int i;
@ -384,32 +384,32 @@ nmc_term_color_parse_string (const char *str, GError **error)
color = nmc_string_is_valid (str, colors, error); color = nmc_string_is_valid (str, colors, error);
for (p = colors, i = 0; *p != NULL; p++, i++) { for (p = colors, i = 0; *p != NULL; p++, i++) {
if (*p == color) if (*p == color)
return (NmcTermColor) i; return (NMMetaTermColor) i;
} }
return -1; return -1;
} }
} }
const char * const char *
nmc_term_format_sequence (NmcTermFormat format) nmc_term_format_sequence (NMMetaTermFormat format)
{ {
switch (format) { switch (format) {
case NMC_TERM_FORMAT_BOLD: case NM_META_TERM_FORMAT_BOLD:
return "\33[1m"; return "\33[1m";
break; break;
case NMC_TERM_FORMAT_DIM: case NM_META_TERM_FORMAT_DIM:
return "\33[2m"; return "\33[2m";
break; break;
case NMC_TERM_FORMAT_UNDERLINE: case NM_META_TERM_FORMAT_UNDERLINE:
return "\33[4m"; return "\33[4m";
break; break;
case NMC_TERM_FORMAT_BLINK: case NM_META_TERM_FORMAT_BLINK:
return "\33[5m"; return "\33[5m";
break; break;
case NMC_TERM_FORMAT_REVERSE: case NM_META_TERM_FORMAT_REVERSE:
return "\33[7m"; return "\33[7m";
break; break;
case NMC_TERM_FORMAT_HIDDEN: case NM_META_TERM_FORMAT_HIDDEN:
return "\33[8m"; return "\33[8m";
break; break;
default: default:
@ -438,7 +438,7 @@ use_colors (NmcColorOption color_option)
} }
char * char *
nmc_colorize (NmcColorOption color_option, NmcTermColor color, NmcTermFormat format, const char *fmt, ...) nmc_colorize (NmcColorOption color_option, NMMetaTermColor color, NMMetaTermFormat format, const char *fmt, ...)
{ {
va_list args; va_list args;
char *str, *colored; char *str, *colored;
@ -670,7 +670,7 @@ set_val_arrc (NmcOutputField fields_array[], guint32 idx, const char **value)
} }
void void
set_val_color_all (NmcOutputField fields_array[], NmcTermColor color) set_val_color_all (NmcOutputField fields_array[], NMMetaTermColor color)
{ {
int i; int i;
@ -680,7 +680,7 @@ set_val_color_all (NmcOutputField fields_array[], NmcTermColor color)
} }
void void
set_val_color_fmt_all (NmcOutputField fields_array[], NmcTermFormat format) set_val_color_fmt_all (NmcOutputField fields_array[], NMMetaTermFormat format)
{ {
int i; int i;
@ -1005,15 +1005,15 @@ nmc_empty_output_fields (NmcOutputData *output_data)
static const char * static const char *
colorize_string (NmcColorOption color_option, colorize_string (NmcColorOption color_option,
NmcTermColor color, NMMetaTermColor color,
NmcTermFormat color_fmt, NMMetaTermFormat color_fmt,
const char *str, const char *str,
char **out_to_free) char **out_to_free)
{ {
const char *out = str; const char *out = str;
if ( use_colors (color_option) if ( use_colors (color_option)
&& (color != NMC_TERM_COLOR_NORMAL || color_fmt != NMC_TERM_FORMAT_NORMAL)) { && (color != NM_META_TERM_COLOR_NORMAL || color_fmt != NM_META_TERM_FORMAT_NORMAL)) {
*out_to_free = nmc_colorize (color_option, color, color_fmt, "%s", str); *out_to_free = nmc_colorize (color_option, color, color_fmt, "%s", str);
out = *out_to_free; out = *out_to_free;
} }

12
clients/cli/utils.h
View file

@ -40,10 +40,10 @@ gboolean nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***a
char *ssid_to_hex (const char *str, gsize len); char *ssid_to_hex (const char *str, gsize len);
void nmc_terminal_erase_line (void); void nmc_terminal_erase_line (void);
void nmc_terminal_show_progress (const char *str); void nmc_terminal_show_progress (const char *str);
const char *nmc_term_color_sequence (NmcTermColor color); const char *nmc_term_color_sequence (NMMetaTermColor color);
const char *nmc_term_format_sequence (NmcTermFormat format); const char *nmc_term_format_sequence (NMMetaTermFormat format);
NmcTermColor nmc_term_color_parse_string (const char *str, GError **error); NMMetaTermColor nmc_term_color_parse_string (const char *str, GError **error);
char *nmc_colorize (NmcColorOption color_option, NmcTermColor color, NmcTermFormat format, const char * fmt, ...) _nm_printf (4, 5); char *nmc_colorize (NmcColorOption color_option, NMMetaTermColor color, NMMetaTermFormat format, const char * fmt, ...) _nm_printf (4, 5);
void nmc_filter_out_colors_inplace (char *str); void nmc_filter_out_colors_inplace (char *str);
char *nmc_filter_out_colors (const char *str); char *nmc_filter_out_colors (const char *str);
char *nmc_get_user_input (const char *ask_str); char *nmc_get_user_input (const char *ask_str);
@ -57,8 +57,8 @@ void set_val_str (NmcOutputField fields_array[], guint32 index, char *value);
void set_val_strc (NmcOutputField fields_array[], guint32 index, const char *value); void set_val_strc (NmcOutputField fields_array[], guint32 index, const char *value);
void set_val_arr (NmcOutputField fields_array[], guint32 index, char **value); void set_val_arr (NmcOutputField fields_array[], guint32 index, char **value);
void set_val_arrc (NmcOutputField fields_array[], guint32 index, const char **value); void set_val_arrc (NmcOutputField fields_array[], guint32 index, const char **value);
void set_val_color_all (NmcOutputField fields_array[], NmcTermColor color); void set_val_color_all (NmcOutputField fields_array[], NMMetaTermColor color);
void set_val_color_fmt_all (NmcOutputField fields_array[], NmcTermFormat format); void set_val_color_fmt_all (NmcOutputField fields_array[], NMMetaTermFormat format);
void nmc_free_output_field_values (NmcOutputField fields_array[]); void nmc_free_output_field_values (NmcOutputField fields_array[]);
typedef struct { typedef struct {

22
clients/common/nm-meta-setting-desc.h
View file

@ -24,6 +24,28 @@
#define NM_META_TEXT_HIDDEN "<hidden>" #define NM_META_TEXT_HIDDEN "<hidden>"
typedef enum {
NM_META_TERM_COLOR_NORMAL = 0,
NM_META_TERM_COLOR_BLACK = 1,
NM_META_TERM_COLOR_RED = 2,
NM_META_TERM_COLOR_GREEN = 3,
NM_META_TERM_COLOR_YELLOW = 4,
NM_META_TERM_COLOR_BLUE = 5,
NM_META_TERM_COLOR_MAGENTA = 6,
NM_META_TERM_COLOR_CYAN = 7,
NM_META_TERM_COLOR_WHITE = 8,
} NMMetaTermColor;
typedef enum {
NM_META_TERM_FORMAT_NORMAL = 0,
NM_META_TERM_FORMAT_BOLD = 1,
NM_META_TERM_FORMAT_DIM = 2,
NM_META_TERM_FORMAT_UNDERLINE = 3,
NM_META_TERM_FORMAT_BLINK = 4,
NM_META_TERM_FORMAT_REVERSE = 5,
NM_META_TERM_FORMAT_HIDDEN = 6,
} NMMetaTermFormat;
typedef enum { typedef enum {
NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PRETTY,
NM_META_ACCESSOR_GET_TYPE_PARSABLE, NM_META_ACCESSOR_GET_TYPE_PARSABLE,