From 2b75cba66b24ef0cebe8cb7da3400dac5bac88a9 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 16 Jun 2012 14:00:00 +0000 Subject: [PATCH] more config in gui plus translucency now works. even from gui. wordsep and scrollback config wont save/change. need to do. SVN revision: 72237 --- data/themes/default.edc | 22 +++++++ data/themes/images/bg_shadow.png | Bin 10162 -> 9401 bytes src/bin/Makefile.am | 1 + src/bin/main.c | 17 +++++ src/bin/main.h | 1 + src/bin/options.c | 3 +- src/bin/options_behavior.c | 109 +++++++++++++++++++++++++++++++ src/bin/options_behavior.h | 1 + 8 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 src/bin/options_behavior.c create mode 100644 src/bin/options_behavior.h diff --git a/data/themes/default.edc b/data/themes/default.edc index 4027d8f8..21a76b93 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -13,12 +13,20 @@ collections { fill.smooth: 0; visible: 0; } + description { state: "translucent" 0.0; + inherit: "default" 0.0; + visible: 1; + } } part { name: "base"; type: RECT; mouse_events: 1; description { state: "default" 0.0; color: 48 48 48 255; } + description { state: "translucent" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { name: "terminology.content"; type: SWALLOW; description { state: "default" 0.0; @@ -84,6 +92,20 @@ collections { transition: DECELERATE 0.5; target: "terminology.options"; } + program { name: "trans_on"; + signal: "translucent,on"; + source: "terminology"; + action: STATE_SET "translucent" 0.0; + target: "base"; + target: "shadow"; + } + program { name: "trans_off"; + signal: "translucent,off"; + source: "terminology"; + action: STATE_SET "default" 0.0; + target: "base"; + target: "shadow"; + } } } } diff --git a/data/themes/images/bg_shadow.png b/data/themes/images/bg_shadow.png index ae502f8aef3da40d92e4136457218a669a5acf75..be97a9aed859b7a0ed786894d39599d6afdb6c54 100644 GIT binary patch delta 9361 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∨;Mgy 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 A5dZ)H diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index fbebdbbb..eddc6eeb 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -15,6 +15,7 @@ keyin.c keyin.h \ main.c main.h \ options.c options.h \ options_font.c options_font.h \ +options_behavior.c options_behavior.h \ termio.c termio.h \ termpty.c termpty.h \ utf8.c utf8.h \ diff --git a/src/bin/main.c b/src/bin/main.c index 507d7bf0..1b99be67 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -47,6 +47,21 @@ _cb_options(void *data, Evas_Object *obj, void *event) options_toggle(win, bg, term); } +void +main_trans_update(void) +{ + if (config->translucent) + { + edje_object_signal_emit(bg, "translucent,on", "terminology"); + elm_win_alpha_set(win, EINA_TRUE); + } + else + { + edje_object_signal_emit(bg, "translucent,off", "terminology"); + elm_win_alpha_set(win, EINA_FALSE); + } +} + EAPI_MAIN int elm_main(int argc, char **argv) { @@ -90,6 +105,8 @@ elm_main(int argc, char **argv) evas_object_smart_callback_add(o, "options", _cb_options, NULL); evas_object_show(o); + main_trans_update(); + evas_object_smart_callback_add(win, "focus,in", _cb_focus_in, term); evas_object_smart_callback_add(win, "focus,out", _cb_focus_out, term); _cb_size_hint(win, evas_object_evas_get(win), term, NULL); diff --git a/src/bin/main.h b/src/bin/main.h index e69de29b..216876c6 100644 --- a/src/bin/main.h +++ b/src/bin/main.h @@ -0,0 +1 @@ +void main_trans_update(void); diff --git a/src/bin/options.c b/src/bin/options.c index f5ea827f..b1380aa4 100644 --- a/src/bin/options.c +++ b/src/bin/options.c @@ -1,6 +1,7 @@ #include #include "options.h" #include "options_font.h" +#include "options_behavior.h" static Evas_Object *op_frame, *op_box = NULL, *op_toolbar = NULL, *op_opbox = NULL; static Eina_Bool op_out = EINA_FALSE; @@ -30,7 +31,7 @@ static void _cb_op_behavior(void *data, Evas_Object *obj, void *event) { elm_box_clear(op_opbox); - // XXX: not done yet + options_behavior(op_opbox, data); } void diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c new file mode 100644 index 00000000..b398dab6 --- /dev/null +++ b/src/bin/options_behavior.c @@ -0,0 +1,109 @@ +#include +#include "config.h" +#include "termio.h" +#include "options.h" +#include "options_font.h" +#include "main.h" + +static Evas_Object *op_sbslider, *op_jumpcheck, *op_trans, *op_wordsep; + +static void +_cb_op_behavior_jump_chg(void *data, Evas_Object *obj, void *event) +{ + config->jump_on_change = elm_check_state_get(obj); + termio_config_update(data); + config_save(); +} + +static void +_cb_op_behavior_trans_chg(void *data, Evas_Object *obj, void *event) +{ + config->translucent = elm_check_state_get(obj); + main_trans_update(); + config_save(); +} + +static void +_cb_op_behavior_wsep_chg(void *data, Evas_Object *obj, void *event) +{ + // XXX: do +} + +static void +_cb_op_behavior_sback_chg(void *data, Evas_Object *obj, void *event) +{ + // XXX: do +} + +void +options_behavior(Evas_Object *opbox, Evas_Object *term) +{ + Evas_Object *o; + char *txt; + + op_jumpcheck = o = elm_check_add(opbox); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); + elm_object_text_set(o, "Jump to bottom on change"); + elm_check_state_set(o, config->jump_on_change); + elm_box_pack_end(opbox, o); + evas_object_show(o); + evas_object_smart_callback_add(o, "changed", + _cb_op_behavior_jump_chg, term); + + op_jumpcheck = o = elm_check_add(opbox); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); + elm_object_text_set(o, "Translucent"); + elm_check_state_set(o, config->translucent); + elm_box_pack_end(opbox, o); + evas_object_show(o); + evas_object_smart_callback_add(o, "changed", + _cb_op_behavior_trans_chg, NULL); + + o = elm_label_add(opbox); + evas_object_size_hint_weight_set(o, 0.0, 0.0); + evas_object_size_hint_align_set(o, 0.0, 0.5); + elm_object_text_set(o, "Word separators:"); + elm_box_pack_end(opbox, o); + evas_object_show(o); + + op_wordsep = o = elm_entry_add(opbox); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); + elm_entry_scrollable_set(o, EINA_TRUE); + elm_entry_single_line_set(o, EINA_TRUE); + txt = elm_entry_utf8_to_markup(config->wordsep); + if (txt) + { + elm_object_text_set(o, txt); + free(txt); + } + elm_box_pack_end(opbox, o); + evas_object_show(o); + evas_object_smart_callback_add(o, "changed", + _cb_op_behavior_wsep_chg, term); + + o = elm_label_add(opbox); + evas_object_size_hint_weight_set(o, 0.0, 0.0); + evas_object_size_hint_align_set(o, 0.0, 0.5); + elm_object_text_set(o, "Scrollback lines:"); + elm_box_pack_end(opbox, o); + evas_object_show(o); + + op_sbslider = o = elm_slider_add(opbox); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); + elm_slider_span_size_set(o, 160); + elm_slider_unit_format_set(o, "%1.0f"); + elm_slider_indicator_format_set(o, "%1.0f"); + elm_slider_min_max_set(o, 0, 10000); + elm_slider_value_set(o, config->scrollback); + elm_box_pack_end(opbox, o); + evas_object_show(o); + evas_object_smart_callback_add(o, "delay,changed", + _cb_op_behavior_sback_chg, term); + + elm_box_pack_end(opbox, o); + evas_object_show(o); +} diff --git a/src/bin/options_behavior.h b/src/bin/options_behavior.h new file mode 100644 index 00000000..ede2d282 --- /dev/null +++ b/src/bin/options_behavior.h @@ -0,0 +1 @@ +void options_behavior(Evas_Object *opbox, Evas_Object *term);