revert! broke terminology build completely.
SVN revision: 78312
This commit is contained in:
parent
162d965bec
commit
2c18ec8ba2
|
@ -50,18 +50,6 @@ src/bin/terminology-termio.o
|
|||
src/bin/terminology-termpty.o
|
||||
src/bin/terminology-utf8.o
|
||||
src/bin/terminology-win.o
|
||||
src/bin/background_generated.c
|
||||
src/bin/background_generated.h
|
||||
src/bin/cursor_generated.c
|
||||
src/bin/cursor_generated.h
|
||||
src/bin/fontpreview_generated.c
|
||||
src/bin/fontpreview_generated.h
|
||||
src/bin/mediabusy_generated.c
|
||||
src/bin/mediabusy_generated.h
|
||||
src/bin/mediactrl_generated.c
|
||||
src/bin/mediactrl_generated.h
|
||||
src/bin/selection_generated.c
|
||||
src/bin/selection_generated.h
|
||||
stamp-h1
|
||||
terminology_config.h
|
||||
terminology_config.h.in
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = data src
|
||||
SUBDIRS = src data
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
|
|
|
@ -37,7 +37,6 @@ PKG_CHECK_MODULES([TERMINOLOGY], [${requirements}])
|
|||
AC_CHECK_FUNCS(mkstemps)
|
||||
|
||||
EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
|
||||
EFL_WITH_BIN([edje], [edje-codegen], [edje_codegen])
|
||||
|
||||
with_max_log_level="EINA_LOG_LEVEL_ERR"
|
||||
AC_ARG_WITH(maximum-log-level,
|
||||
|
|
|
@ -60,7 +60,6 @@ collections {
|
|||
}
|
||||
}
|
||||
part { name: "terminology.background"; type: SWALLOW;
|
||||
api: "background" "The background";
|
||||
clip_to: "fade";
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
|
@ -84,7 +83,6 @@ collections {
|
|||
target: "base";
|
||||
target: "shadow";
|
||||
target: "fade";
|
||||
api: "translucent,on" "Set the state \"translucent\" to the parts base, shadow and fade";
|
||||
}
|
||||
program { name: "trans_off";
|
||||
signal: "translucent,off";
|
||||
|
@ -92,49 +90,42 @@ collections {
|
|||
action: STATE_SET "default" 0.0;
|
||||
target: "base";
|
||||
target: "shadow";
|
||||
target: "fade";
|
||||
api: "translucent,off" "Set the state \"default\" to the parts base, shadow and fade";
|
||||
target: "fade";
|
||||
}
|
||||
program { name: "media_off";
|
||||
signal: "media,off";
|
||||
source: "terminology";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "terminology.background";
|
||||
api: "media,off" "Set the state \"default\" to part terminology.background";
|
||||
}
|
||||
program { name: "media_img";
|
||||
signal: "media,image";
|
||||
source: "terminology";
|
||||
action: STATE_SET "image" 0.0;
|
||||
target: "terminology.background";
|
||||
api: "media,image" "Set the state \"image\" to part terminology.background";
|
||||
}
|
||||
program { name: "media_scale";
|
||||
signal: "media,scale";
|
||||
source: "terminology";
|
||||
action: STATE_SET "scale" 0.0;
|
||||
target: "terminology.background";
|
||||
api: "media,scale" "Set the state \"scale\" to part terminology.background";
|
||||
}
|
||||
program { name: "media_edje";
|
||||
signal: "media,edje";
|
||||
source: "terminology";
|
||||
action: STATE_SET "edje" 0.0;
|
||||
target: "terminology.background";
|
||||
api: "media,edje" "Set the state \"edje\" to part terminology.background";
|
||||
}
|
||||
program { name: "media_mov";
|
||||
signal: "media,movie";
|
||||
source: "terminology";
|
||||
action: STATE_SET "movie" 0.0;
|
||||
target: "terminology.background";
|
||||
api: "media,movie" "Set the state \"movie\" to part terminology.background";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// actual text grid for chars, cursors, selectiond etc. goes here
|
||||
part { name: "terminology.content"; type: SWALLOW;
|
||||
api: "content" "actual text grid for chars, cursors, selectiond etc. goes here";
|
||||
description { state: "default" 0.0;
|
||||
rel1.offset: 1 2;
|
||||
rel2.offset: -2 -2;
|
||||
|
@ -219,7 +210,6 @@ collections {
|
|||
}
|
||||
}
|
||||
part { name: "terminology.cmdbox"; type: SWALLOW;
|
||||
api: "cmdbox" "The command box";
|
||||
clip_to: "cmdclip";
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
@ -242,7 +232,6 @@ collections {
|
|||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.4;
|
||||
target: "cmdclip";
|
||||
api: "command_box,show" "Set the state \"visible\" to part cmdclip";
|
||||
}
|
||||
program { name: "cmdshow";
|
||||
signal: "cmdbox,show";
|
||||
|
@ -258,7 +247,6 @@ collections {
|
|||
transition: ACCELERATE 0.5;
|
||||
target: "terminology.cmdbox";
|
||||
target: "cmdclip";
|
||||
api: "command_box,hide" "Set the state \"visible\" to parts terminology.cmdbox and cmdclip";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
|
@ -358,7 +346,6 @@ collections {
|
|||
target: "bell_strobe";
|
||||
target: "bell_glow";
|
||||
after: "bell";
|
||||
api: "bell" "Set the state \"default\" to the parts bell_base, bell, bell_strobe and bell_glow";
|
||||
}
|
||||
program { name: "bell";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
|
@ -456,7 +443,6 @@ collections {
|
|||
}
|
||||
}
|
||||
part { name: "terminology.popmedia"; type: SWALLOW;
|
||||
api: "popmedia" "The popup for media";
|
||||
clip_to: "popmedia_clip";
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
@ -606,7 +592,6 @@ collections {
|
|||
}
|
||||
program { name: "popmedia_dismiss2";
|
||||
action: SIGNAL_EMIT "popmedia,done" "terminology";
|
||||
api: "popup_dismiss" "Dismiss the media popup. It emits the signal \"popmedia,done\"";
|
||||
}
|
||||
program { name: "popmedia_off";
|
||||
signal: "popmedia,off";
|
||||
|
@ -624,7 +609,6 @@ collections {
|
|||
target: "popmedia_glintclip";
|
||||
target: "popmedia_shine";
|
||||
after: "popmedia_dismiss2";
|
||||
api: "popup_off" "Set the state \"default\" for several parts";
|
||||
}
|
||||
program { name: "popmedia_img";
|
||||
signal: "popmedia,image";
|
||||
|
@ -632,7 +616,6 @@ collections {
|
|||
action: STATE_SET "image" 0.0;
|
||||
transition: DECELERATE 0.2;
|
||||
target: "terminology.popmedia";
|
||||
api: "popup_image" "Set the state \"image\" to part terminology.popmedia";
|
||||
}
|
||||
program { name: "popmedia_scale";
|
||||
signal: "popmedia,scale";
|
||||
|
@ -640,7 +623,6 @@ collections {
|
|||
action: STATE_SET "scale" 0.0;
|
||||
transition: DECELERATE 0.2;
|
||||
target: "terminology.popmedia";
|
||||
api: "popup_scale" "Set the state \"scale\" to part terminology.popmedia";
|
||||
}
|
||||
program { name: "popmedia_edje";
|
||||
signal: "popmedia,edje";
|
||||
|
@ -648,7 +630,6 @@ collections {
|
|||
action: STATE_SET "edje" 0.0;
|
||||
transition: DECELERATE 0.2;
|
||||
target: "terminology.popmedia";
|
||||
api: "popup_edje" "Set the state \"edje\" to part terminology.popmedia";
|
||||
}
|
||||
program { name: "popmedia_mov";
|
||||
signal: "popmedia,movie";
|
||||
|
@ -656,7 +637,6 @@ collections {
|
|||
action: STATE_SET "movie" 0.0;
|
||||
transition: DECELERATE 0.2;
|
||||
target: "terminology.popmedia";
|
||||
api: "popup_movie" "Set the state \"movie\" to part terminology.popmedia";
|
||||
}
|
||||
program { name: "popmedia_img2";
|
||||
signal: "popmedia,image";
|
||||
|
@ -722,7 +702,6 @@ collections {
|
|||
////////////////////////////////////////////////////////////////////
|
||||
// overlayed options and controls
|
||||
part { name: "terminology.about"; type: SWALLOW;
|
||||
api: "about" "overlayed options and controls";
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
@ -747,7 +726,6 @@ collections {
|
|||
action: STATE_SET "visible" 0.0;
|
||||
transition: SPRING 1.2 2.0 6;
|
||||
target: "terminology.about";
|
||||
api: "about_show" "It sets the state visible fot the part terminology.about";
|
||||
}
|
||||
program { name: "ab_hide";
|
||||
signal: "about,hide";
|
||||
|
@ -755,13 +733,11 @@ collections {
|
|||
action: STATE_SET "default" 0.0;
|
||||
transition: DECELERATE 0.6;
|
||||
target: "terminology.about";
|
||||
api: "about_hide" "It sets the state default for the part terminology.about";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// swallow to hold invisile rect to click on to dismiss things
|
||||
part { name: "terminology.dismiss"; type: SWALLOW;
|
||||
api: "dismiss" "swallow to hold invisile rect to click on to dismiss things";
|
||||
description { state: "default" 0.0;
|
||||
}
|
||||
}
|
||||
|
@ -769,7 +745,6 @@ collections {
|
|||
////////////////////////////////////////////////////////////////////
|
||||
// overlayed options and controls
|
||||
part { name: "terminology.optdetails"; type: SWALLOW;
|
||||
api: "option_details" "overlayed options and controls";
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
@ -806,7 +781,6 @@ collections {
|
|||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.4;
|
||||
target: "terminology.optdetails";
|
||||
api: "option_details_show" "Show the options details";
|
||||
}
|
||||
program { name: "opdt_hide";
|
||||
signal: "optdetails,hide";
|
||||
|
@ -815,15 +789,12 @@ collections {
|
|||
transition: DECELERATE 0.2;
|
||||
target: "terminology.optdetails";
|
||||
after: "opdt_hide2";
|
||||
api: "option_details_hide" "Hide the options details";
|
||||
}
|
||||
program { name: "opdt_hide2";
|
||||
action: SIGNAL_EMIT "optdetails,hide,done" "terminology";
|
||||
api: "option_details,hide,done" "Signal emitted when the option_details has hidden";
|
||||
}
|
||||
|
||||
part { name: "terminology.options"; type: SWALLOW;
|
||||
api: "options" "The options";
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
@ -856,7 +827,6 @@ collections {
|
|||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.4;
|
||||
target: "terminology.options";
|
||||
api: "options,show" "To show the options";
|
||||
}
|
||||
program { name: "op_hide";
|
||||
signal: "options,hide";
|
||||
|
@ -864,11 +834,9 @@ collections {
|
|||
action: STATE_SET "default" 0.0;
|
||||
transition: DECELERATE 0.6;
|
||||
target: "terminology.options";
|
||||
api: "options,hide" "To hide the options";
|
||||
}
|
||||
|
||||
part { name: "terminology.controls"; type: SWALLOW;
|
||||
api: "controls" "The controls";
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
fixed: 1 1;
|
||||
|
@ -903,7 +871,6 @@ collections {
|
|||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.3;
|
||||
target: "terminology.controls";
|
||||
api: "controls,show" "Set the state \"visible\" to part terminology.controls";
|
||||
}
|
||||
program { name: "ct_hide";
|
||||
signal: "controls,hide";
|
||||
|
@ -911,7 +878,6 @@ collections {
|
|||
action: STATE_SET "default" 0.0;
|
||||
transition: DECELERATE 0.5;
|
||||
target: "terminology.controls";
|
||||
api: "controls,hide" "Set the state \"default\" to part terminology.controls";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1188,7 +1154,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
|
|||
source: "terminology";
|
||||
action: STATE_SET "oneline" 0.0;
|
||||
TARGETS;
|
||||
api: "mode,oneline" "Set the state \"oneline\"";
|
||||
}
|
||||
|
||||
// disjoint:
|
||||
|
@ -1386,7 +1351,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
|
|||
source: "terminology";
|
||||
action: STATE_SET "disjoint" 0.0;
|
||||
TARGETS;
|
||||
api: "mode,disjoint" "Set the state \"disjoint\"";
|
||||
}
|
||||
|
||||
// default:
|
||||
|
@ -1581,7 +1545,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
|
|||
source: "terminology";
|
||||
action: STATE_SET "default" 0.0;
|
||||
TARGETS;
|
||||
api: "mode,multiline" "Set the state \"default\"";
|
||||
}
|
||||
|
||||
// topfull:
|
||||
|
@ -1730,7 +1693,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
|
|||
source: "terminology";
|
||||
action: STATE_SET "topfull" 0.0;
|
||||
TARGETS;
|
||||
api: "mode,topfull" "Set the state \"topfull\"";
|
||||
}
|
||||
|
||||
// bottomfull:
|
||||
|
@ -1874,7 +1836,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
|
|||
source: "terminology";
|
||||
action: STATE_SET "bottomfull" 0.0;
|
||||
TARGETS;
|
||||
api: "mode,bottomfull" "Set the state \"bottomfull\"";
|
||||
}
|
||||
|
||||
#define SELPULSE \
|
||||
|
@ -1932,7 +1893,6 @@ target: "4.bottom"
|
|||
// top and bottom swallows used to coimmunicate via min/max size the
|
||||
// size of the top and bottom lines
|
||||
part { name: "terminology.top_left"; type: SWALLOW;
|
||||
api: "top_left" "top swallow used to coimmunicate via min/max size the size of the top line";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
align: 0.0 0.0;
|
||||
|
@ -1941,7 +1901,6 @@ target: "4.bottom"
|
|||
}
|
||||
}
|
||||
part { name: "terminology.bottom_right"; type: SWALLOW;
|
||||
api: "bottom_right" "bottom swallow used to coimmunicate via min/max size the size of the bottom line";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
align: 1.0 1.0;
|
||||
|
@ -1994,7 +1953,6 @@ target: "4.bottom"
|
|||
action: STATE_SET "fading" 0.0;
|
||||
target: "cursor_blink.top_left";
|
||||
after: "top_left.fade";
|
||||
api: "top_left,blinking" "Start blinking the part cursor_blink.top_left";
|
||||
}
|
||||
program { name: "top_left.fade";
|
||||
action: STATE_SET "fading" 1.0;
|
||||
|
@ -2007,7 +1965,6 @@ target: "4.bottom"
|
|||
source: "zone.top_left";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "cursor_blink.top_left";
|
||||
api: "top_left,blinking,stop" "Stop blinking the part cursor_blink.top_left";
|
||||
}
|
||||
}
|
||||
part { name: "cursor.bottom_right"; type: RECT;
|
||||
|
@ -2054,7 +2011,6 @@ target: "4.bottom"
|
|||
action: STATE_SET "fading" 0.0;
|
||||
target: "cursor_blink.bottom_right";
|
||||
after: "bottom_right.fade";
|
||||
api: "bottom_right,blinking" "Start blinking the part cursor_blink.bottom_right";
|
||||
}
|
||||
program { name: "bottom_right.fade";
|
||||
action: STATE_SET "fading" 1.0;
|
||||
|
@ -2067,7 +2023,6 @@ target: "4.bottom"
|
|||
source: "zone.bottom_right";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "cursor_blink.bottom_right";
|
||||
api: "bottom_right,blinking,stop" "Stop blinking the bottom right";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2178,7 +2133,6 @@ target: "4.bottom"
|
|||
action: STATE_SET "focused" 0.0;
|
||||
target: "fill";
|
||||
target: "outline";
|
||||
api: "focus,in,noblink" "No blink the cursor when focus in";
|
||||
}
|
||||
program { name: "focus_in";
|
||||
signal: "focus,in";
|
||||
|
@ -2188,7 +2142,6 @@ target: "4.bottom"
|
|||
target: "outline";
|
||||
after: "focus2";
|
||||
after: "pulse";
|
||||
api: "focus,in" "Set the focus to cursor";
|
||||
}
|
||||
program { name: "focus2";
|
||||
in: 0.5 0.0;
|
||||
|
@ -2225,7 +2178,6 @@ target: "4.bottom"
|
|||
target: "pulse";
|
||||
target: "pulse2";
|
||||
after: "focus_out2";
|
||||
api: "focus,out" "ACTION_STOP for parts focus_in, focus2, focus3, pulse and pulse2";
|
||||
}
|
||||
program { name: "focus_out2";
|
||||
action: STATE_SET "default" 0.0;
|
||||
|
@ -2238,7 +2190,6 @@ target: "4.bottom"
|
|||
action: STATE_SET "default" 0.0;
|
||||
target: "key";
|
||||
after: "key2";
|
||||
api: "key,down" "Set the state \"default\" to the part key";
|
||||
}
|
||||
program { name: "key2";
|
||||
action: STATE_SET "on" 0.0;
|
||||
|
@ -2465,7 +2416,6 @@ target: "4.bottom"
|
|||
action: STATE_SET "visible" 0.0;
|
||||
transition: DECELERATE 0.5;
|
||||
target: "fade";
|
||||
api: "busy" "Set the state \"visible\" to part fade";
|
||||
}
|
||||
program { name: "spin1";
|
||||
signal: "busy";
|
||||
|
@ -2491,7 +2441,6 @@ target: "4.bottom"
|
|||
action: STATE_SET "default" 0.0;
|
||||
transition: DECELERATE 1.5;
|
||||
target: "fade";
|
||||
api: "done" "Set the state default to the part \"fade\"";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2573,7 +2522,6 @@ target: "4.bottom"
|
|||
}
|
||||
}
|
||||
part { name: "terminology.posdrag";
|
||||
api: "position" "The position drag";
|
||||
mouse_events: 1;
|
||||
repeat_events: 1;
|
||||
clip_to: "media_clip";
|
||||
|
@ -2612,7 +2560,6 @@ target: "4.bottom"
|
|||
}
|
||||
}
|
||||
part { name: "terminology.voldrag"; type: IMAGE;
|
||||
api: "volume" "The volume drag";
|
||||
mouse_events: 1;
|
||||
repeat_events: 1;
|
||||
clip_to: "media_clip";
|
||||
|
@ -2638,7 +2585,6 @@ target: "4.bottom"
|
|||
action: STATE_SET "expanded" 0.0;
|
||||
transition: SINUSOIDAL 0.4 CURRENT;
|
||||
target: "media_bg";
|
||||
api: "mouse,in" "Set the state \"expanded\" to the part media_bg";
|
||||
}
|
||||
program { name: "media_mouse_out";
|
||||
signal: "mouse,out";
|
||||
|
@ -2646,55 +2592,47 @@ target: "4.bottom"
|
|||
action: STATE_SET "default" 0.0;
|
||||
transition: SINUSOIDAL 0.4 CURRENT;
|
||||
target: "media_bg";
|
||||
api: "mouse,out" "Set the state \"default\" to the part media_bg";
|
||||
}
|
||||
program { name: "media_pause_click";
|
||||
signal: "mouse,up,*";
|
||||
source: "play";
|
||||
filter: "play" "default";
|
||||
action: SIGNAL_EMIT "pause" "";
|
||||
api: "pause" "It emits the signal \"pause\"";
|
||||
}
|
||||
program { name: "media_play_click";
|
||||
signal: "mouse,up,1";
|
||||
source: "play";
|
||||
filter: "play" "paused";
|
||||
action: SIGNAL_EMIT "play" "";
|
||||
api: "play" "It emits the signal \"play\"";
|
||||
}
|
||||
program { name: "media_stop_click";
|
||||
signal: "mouse,up,1";
|
||||
source: "stop";
|
||||
action: SIGNAL_EMIT "stop" "";
|
||||
api: "stop" "It emits the signal \"stop\"";
|
||||
}
|
||||
program { name: "media_signal_pause";
|
||||
signal: "pause,set";
|
||||
source: "terminology";
|
||||
action: STATE_SET "paused" 0.0;
|
||||
target: "play";
|
||||
api: "pause,set" "It sets the state \"paused\"";
|
||||
}
|
||||
program { name: "media_signal_play";
|
||||
signal: "play,set";
|
||||
source: "terminology";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "play";
|
||||
api: "play,set" "It sets the state \"default\" to play";
|
||||
}
|
||||
program { name: "media_signal_mute";
|
||||
signal: "mute,set";
|
||||
source: "terminology";
|
||||
action: STATE_SET "muted" 0.0;
|
||||
target: "terminology.voldrag";
|
||||
api: "mute,set" "It sets the state \"muted\" to volume drag";
|
||||
}
|
||||
program { name: "media_signal_unmute";
|
||||
signal: "mute,unset";
|
||||
source: "terminology";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "terminology.voldrag";
|
||||
api: "mute,unset" "It sets the state \"default\" to volume drag";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2841,7 +2779,6 @@ target: "4.bottom"
|
|||
}
|
||||
}
|
||||
part { name: "terminology.text.preview"; type: SWALLOW;
|
||||
api: "text_preview" "Text preview for the font selection";
|
||||
clip_to: "clip";
|
||||
description { state: "default" 0.0;
|
||||
rel1 {
|
||||
|
|
|
@ -1,31 +1,5 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EDJE_CODEGEN = @edje_codegen@
|
||||
|
||||
background_generated.c background_generated.h: $(top_builddir)/data/themes/default.edj
|
||||
$(EDJE_CODEGEN) --prefix="background" $(top_builddir)/data/themes/default.edj \
|
||||
terminology/background $(builddir)/background_generated.c $(builddir)/background_generated.h
|
||||
|
||||
cursor_generated.c cursor_generated.h: $(top_builddir)/data/themes/default.edj
|
||||
$(EDJE_CODEGEN) --prefix="cursor" $(top_builddir)/data/themes/default.edj \
|
||||
terminology/cursor $(builddir)/cursor_generated.c $(builddir)/cursor_generated.h
|
||||
|
||||
selection_generated.c selection_generated.h: $(top_builddir)/data/themes/default.edj
|
||||
$(EDJE_CODEGEN) --prefix="selection" $(top_builddir)/data/themes/default.edj \
|
||||
terminology/selection $(builddir)/selection_generated.c $(builddir)/selection_generated.h
|
||||
|
||||
mediactrl_generated.c mediactrl_generated.h: $(top_builddir)/data/themes/default.edj
|
||||
$(EDJE_CODEGEN) --prefix="mediactrl" $(top_builddir)/data/themes/default.edj \
|
||||
terminology/mediactrl $(builddir)/mediactrl_generated.c $(builddir)/mediactrl_generated.h
|
||||
|
||||
mediabusy_generated.c mediabusy_generated.h: $(top_builddir)/data/themes/default.edj
|
||||
$(EDJE_CODEGEN) --prefix="mediabusy" $(top_builddir)/data/themes/default.edj \
|
||||
terminology/mediabusy $(builddir)/mediabusy_generated.c $(builddir)/mediabusy_generated.h
|
||||
|
||||
fontpreview_generated.c fontpreview_generated.h: $(top_builddir)/data/themes/default.edj
|
||||
$(EDJE_CODEGEN) --prefix="fontpreview" $(top_builddir)/data/themes/default.edj \
|
||||
terminology/fontpreview $(builddir)/fontpreview_generated.c $(builddir)/fontpreview_generated.h
|
||||
|
||||
bin_PROGRAMS = terminology
|
||||
|
||||
terminology_CPPFLAGS = -I. \
|
||||
|
@ -34,21 +8,7 @@ terminology_CPPFLAGS = -I. \
|
|||
|
||||
terminology_LDADD = @TERMINOLOGY_LIBS@
|
||||
|
||||
BUILT_SOURCES = \
|
||||
background_generated.c background_generated.h \
|
||||
cursor_generated.c cursor_generated.h \
|
||||
fontpreview_generated.c fontpreview_generated.h \
|
||||
selection_generated.c selection_generated.h \
|
||||
mediactrl_generated.c mediactrl_generated.h \
|
||||
mediabusy_generated.c mediabusy_generated.h
|
||||
|
||||
terminology_SOURCES = \
|
||||
background_generated.c background_generated.h \
|
||||
cursor_generated.c cursor_generated.h \
|
||||
fontpreview_generated.c fontpreview_generated.h \
|
||||
selection_generated.c selection_generated.h \
|
||||
mediactrl_generated.c mediactrl_generated.h \
|
||||
mediabusy_generated.c mediabusy_generated.h \
|
||||
private.h \
|
||||
about.c about.h \
|
||||
col.c col.h \
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
#include <Elementary.h>
|
||||
#include "about.h"
|
||||
|
||||
#include "background_generated.h"
|
||||
|
||||
static Evas_Object *ab_layout = NULL, *ab_over = NULL;
|
||||
static Eina_Bool ab_out = EINA_FALSE;
|
||||
static Ecore_Timer *ab_del_timer = NULL;
|
||||
|
@ -102,18 +100,18 @@ about_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
"DAMAGE.</b>"
|
||||
);
|
||||
evas_object_show(o);
|
||||
background_about_set(bg, ab_layout);
|
||||
edje_object_part_swallow(bg, "terminology.about", ab_layout);
|
||||
}
|
||||
if (!ab_out)
|
||||
{
|
||||
ab_over = o = evas_object_rectangle_add(evas_object_evas_get(win));
|
||||
evas_object_color_set(o, 0, 0, 0, 0);
|
||||
background_about_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.dismiss", o);
|
||||
evas_object_show(o);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
|
||||
_cb_mouse_down, term);
|
||||
|
||||
background_about_show_emit(bg);
|
||||
edje_object_signal_emit(bg, "about,show", "terminology");
|
||||
elm_object_signal_emit(ab_layout, "begin" ,"terminology");
|
||||
ab_out = EINA_TRUE;
|
||||
elm_object_focus_set(ab_layout, EINA_TRUE);
|
||||
|
@ -127,8 +125,8 @@ about_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
{
|
||||
evas_object_del(ab_over);
|
||||
ab_over = NULL;
|
||||
|
||||
background_about_hide_emit(bg);
|
||||
|
||||
edje_object_signal_emit(bg, "about,hide", "terminology");
|
||||
ab_out = EINA_FALSE;
|
||||
elm_object_focus_set(ab_layout, EINA_FALSE);
|
||||
elm_object_focus_set(term, EINA_TRUE);
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
#include "about.h"
|
||||
#include "termio.h"
|
||||
|
||||
#include "background_generated.h"
|
||||
|
||||
static Evas_Object *ct_frame = NULL, *ct_box = NULL, *ct_over = NULL;
|
||||
static Eina_Bool ct_out = EINA_FALSE;
|
||||
static Ecore_Timer *ct_del_timer = NULL;
|
||||
|
@ -132,14 +130,14 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
evas_object_show(o);
|
||||
evas_object_smart_callback_add(o, "clicked", _cb_ct_about, NULL);
|
||||
|
||||
background_controls_set(bg, ct_frame);
|
||||
edje_object_part_swallow(bg, "terminology.controls", ct_frame);
|
||||
evas_object_show(ct_frame);
|
||||
}
|
||||
if (!ct_out)
|
||||
{
|
||||
ct_over = o = evas_object_rectangle_add(evas_object_evas_get(win));
|
||||
evas_object_color_set(o, 0, 0, 0, 0);
|
||||
background_dismiss_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.dismiss", o);
|
||||
evas_object_show(o);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
|
||||
_cb_mouse_down, term);
|
||||
|
@ -147,7 +145,7 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
ct_win = win;
|
||||
ct_bg = bg;
|
||||
ct_term = term;
|
||||
background_controls_show_emit(bg);
|
||||
edje_object_signal_emit(bg, "controls,show", "terminology");
|
||||
ct_out = EINA_TRUE;
|
||||
elm_object_focus_set(ct_frame, EINA_TRUE);
|
||||
if (ct_del_timer)
|
||||
|
@ -161,7 +159,7 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
evas_object_del(ct_over);
|
||||
ct_over = NULL;
|
||||
|
||||
background_controls_hide_emit(bg);
|
||||
edje_object_signal_emit(bg, "controls,hide", "terminology");
|
||||
ct_out = EINA_FALSE;
|
||||
elm_object_focus_set(ct_frame, EINA_FALSE);
|
||||
elm_object_focus_set(term, EINA_TRUE);
|
||||
|
|
|
@ -11,9 +11,6 @@
|
|||
#include "media.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include "background_generated.h"
|
||||
#include "cursor_generated.h"
|
||||
|
||||
int _log_domain = -1;
|
||||
|
||||
static Evas_Object *win = NULL, *bg = NULL, *backbg = NULL, *term = NULL, *media = NULL;
|
||||
|
@ -37,7 +34,7 @@ _cb_focus_in(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
|
|||
{
|
||||
if (!focused) elm_win_urgent_set(win, EINA_FALSE);
|
||||
focused = EINA_TRUE;
|
||||
cursor_focus_in_emit(bg);
|
||||
edje_object_signal_emit(bg, "focus,in", "terminology");
|
||||
if (cmdbox_up)
|
||||
elm_object_focus_set(cmdbox, EINA_TRUE);
|
||||
else
|
||||
|
@ -48,7 +45,7 @@ static void
|
|||
_cb_focus_out(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
|
||||
{
|
||||
focused = EINA_FALSE;
|
||||
cursor_focus_out_emit(bg);
|
||||
edje_object_signal_emit(bg, "focus,out", "terminology");
|
||||
if (cmdbox_up)
|
||||
elm_object_focus_set(cmdbox, EINA_FALSE);
|
||||
else
|
||||
|
@ -108,7 +105,7 @@ _cb_bell(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSE
|
|||
Config *config = termio_config_get(term);
|
||||
|
||||
if (!config->disable_visual_bell)
|
||||
background_bell_emit(bg);
|
||||
edje_object_signal_emit(bg, "bell", "terminology");
|
||||
if (!config) return;
|
||||
if (config->urg_bell)
|
||||
{
|
||||
|
@ -130,7 +127,7 @@ _cb_popmedia_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char
|
|||
static void
|
||||
_cb_popmedia_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
background_popup_off_emit(bg);
|
||||
edje_object_signal_emit(bg, "popmedia,off", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -148,16 +145,16 @@ _cb_popup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUS
|
|||
if (!popmedia) termio_mouseover_suspend_pushpop(term, 1);
|
||||
popmedia = o = media_add(win, src, config, MEDIA_POP, &type);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _cb_popmedia_del, NULL);
|
||||
background_popmedia_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.popmedia", o);
|
||||
evas_object_show(o);
|
||||
if (type == TYPE_IMG)
|
||||
background_popup_image_emit(bg);
|
||||
edje_object_signal_emit(bg, "popmedia,image", "terminology");
|
||||
else if (type == TYPE_SCALE)
|
||||
background_popup_scale_emit(bg);
|
||||
edje_object_signal_emit(bg, "popmedia,scale", "terminology");
|
||||
else if (type == TYPE_EDJE)
|
||||
background_popup_edje_emit(bg);
|
||||
edje_object_signal_emit(bg, "popmedia,edje", "terminology");
|
||||
else if (type == TYPE_MOV)
|
||||
background_popup_movie_emit(bg);
|
||||
edje_object_signal_emit(bg, "popmedia,movie", "terminology");
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
@ -173,7 +170,7 @@ _cb_cmdbox(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNU
|
|||
{
|
||||
cmdbox_up = EINA_TRUE;
|
||||
elm_object_focus_set(term, EINA_FALSE);
|
||||
background_command_box_show_emit(bg);
|
||||
edje_object_signal_emit(bg, "cmdbox,show", "terminology");
|
||||
elm_entry_entry_set(cmdbox, "");
|
||||
evas_object_show(cmdbox);
|
||||
if (_cmdbox_focus_timer) ecore_timer_del(_cmdbox_focus_timer);
|
||||
|
@ -186,7 +183,7 @@ _cb_cmd_activated(void *data __UNUSED__, Evas_Object *obj, void *event __UNUSED_
|
|||
char *cmd;
|
||||
|
||||
elm_object_focus_set(obj, EINA_FALSE);
|
||||
background_command_box_hide_emit(bg);
|
||||
edje_object_signal_emit(bg, "cmdbox,hide", "terminology");
|
||||
elm_object_focus_set(term, EINA_TRUE);
|
||||
cmd = (char *)elm_entry_entry_get(obj);
|
||||
if (cmd)
|
||||
|
@ -210,7 +207,7 @@ static void
|
|||
_cb_cmd_aborted(void *data __UNUSED__, Evas_Object *obj, void *event __UNUSED__)
|
||||
{
|
||||
elm_object_focus_set(obj, EINA_FALSE);
|
||||
background_command_box_hide_emit(bg);
|
||||
edje_object_signal_emit(bg, "cmdbox,hide", "terminology");
|
||||
elm_object_focus_set(term, EINA_TRUE);
|
||||
if (_cmdbox_focus_timer)
|
||||
{
|
||||
|
@ -241,7 +238,7 @@ static void
|
|||
_cb_cmd_hints_changed(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
|
||||
{
|
||||
evas_object_show(obj);
|
||||
background_cmdbox_set(data, obj);
|
||||
edje_object_part_swallow(data, "terminology.cmdbox", obj);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -249,13 +246,13 @@ main_trans_update(const Config *config)
|
|||
{
|
||||
if (config->translucent)
|
||||
{
|
||||
background_translucent_on_emit(bg);
|
||||
edje_object_signal_emit(bg, "translucent,on", "terminology");
|
||||
elm_win_alpha_set(win, EINA_TRUE);
|
||||
evas_object_hide(backbg);
|
||||
}
|
||||
else
|
||||
{
|
||||
background_translucent_off_emit(bg);
|
||||
edje_object_signal_emit(bg, "translucent,off", "terminology");
|
||||
elm_win_alpha_set(win, EINA_FALSE);
|
||||
evas_object_show(backbg);
|
||||
}
|
||||
|
@ -266,7 +263,7 @@ _cb_media_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
|
|||
{
|
||||
Config *config = data;
|
||||
media = NULL;
|
||||
background_media_off_emit(bg);
|
||||
edje_object_signal_emit(bg, "media,off", "terminology");
|
||||
if (config->temporary) eina_stringshare_replace(&(config->background), NULL);
|
||||
}
|
||||
|
||||
|
@ -287,22 +284,22 @@ main_media_update(const Config *config)
|
|||
o = media = media_add(win, config->background, config, MEDIA_BG, &type);
|
||||
evas_object_event_callback_add(media, EVAS_CALLBACK_DEL,
|
||||
_cb_media_del, config);
|
||||
background_background_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.background", o);
|
||||
evas_object_show(o);
|
||||
if (type == TYPE_IMG)
|
||||
background_media_image_emit(bg);
|
||||
edje_object_signal_emit(bg, "media,image", "terminology");
|
||||
else if (type == TYPE_SCALE)
|
||||
background_media_scale_emit(bg);
|
||||
edje_object_signal_emit(bg, "media,scale", "terminology");
|
||||
else if (type == TYPE_EDJE)
|
||||
background_media_edje_emit(bg);
|
||||
edje_object_signal_emit(bg, "media,edje", "terminology");
|
||||
else if (type == TYPE_MOV)
|
||||
background_media_movie_emit(bg);
|
||||
edje_object_signal_emit(bg, "media,movie", "terminology");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (media)
|
||||
{
|
||||
background_media_off_emit(bg);
|
||||
edje_object_signal_emit(bg, "media,off", "terminology");
|
||||
evas_object_del(media);
|
||||
media = NULL;
|
||||
}
|
||||
|
@ -682,7 +679,8 @@ elm_main(int argc, char **argv)
|
|||
elm_object_content_set(conform, o);
|
||||
evas_object_show(o);
|
||||
|
||||
background_popup_dismiss_callback_add(o, _cb_popmedia_done, NULL);
|
||||
edje_object_signal_callback_add(o, "popmedia,done", "terminology",
|
||||
_cb_popmedia_done, NULL);
|
||||
|
||||
if (pos_set)
|
||||
{
|
||||
|
@ -708,7 +706,7 @@ elm_main(int argc, char **argv)
|
|||
evas_object_smart_callback_add(o, "aborted", _cb_cmd_aborted, bg);
|
||||
evas_object_smart_callback_add(o, "changed,user", _cb_cmd_changed, bg);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _cb_cmd_hints_changed, bg);
|
||||
background_cmdbox_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.cmdbox", o);
|
||||
|
||||
term = o = termio_add(win, config, cmd, login_shell, cd, size_w, size_h);
|
||||
termio_win_set(o, win);
|
||||
|
@ -717,7 +715,7 @@ elm_main(int argc, char **argv)
|
|||
evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_cb_size_hint, win);
|
||||
background_content_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.content", o);
|
||||
evas_object_smart_callback_add(o, "options", _cb_options, NULL);
|
||||
evas_object_smart_callback_add(o, "change", _cb_change, NULL);
|
||||
evas_object_smart_callback_add(o, "exited", _cb_exited, NULL);
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
#include "config.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include "mediabusy_generated.h"
|
||||
#include "mediactrl_generated.h"
|
||||
|
||||
typedef struct _Media Media;
|
||||
|
||||
struct _Media
|
||||
|
@ -375,7 +372,7 @@ _cb_mov_frame_decode(void *data, Evas_Object *obj __UNUSED__, void *event __UNUS
|
|||
len = emotion_object_play_length_get(sd->o_img);
|
||||
pos = emotion_object_position_get(sd->o_img);
|
||||
pos /= len;
|
||||
mediactrl_volume_drag_value_set(sd->o_ctrl, pos, pos);
|
||||
edje_object_part_drag_value_set(sd->o_ctrl, "terminology.posdrag", pos, pos);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -459,8 +456,7 @@ _cb_media_vol(void *data, Evas_Object *obj __UNUSED__, const char *emission __UN
|
|||
double vx, vy;
|
||||
Media *sd = evas_object_smart_data_get(data);
|
||||
if (!sd) return;
|
||||
|
||||
mediactrl_volume_drag_value_get(sd->o_ctrl, &vx, &vy);
|
||||
edje_object_part_drag_value_get(sd->o_ctrl, "terminology.voldrag", &vx, &vy);
|
||||
media_volume_set(data, vx + vy);
|
||||
}
|
||||
|
||||
|
@ -470,8 +466,7 @@ _cb_media_pos(void *data, Evas_Object *obj __UNUSED__, const char *emission __UN
|
|||
double vx, vy;
|
||||
Media *sd = evas_object_smart_data_get(data);
|
||||
if (!sd) return;
|
||||
|
||||
mediactrl_volume_drag_value_get(sd->o_ctrl, &vx, &vy);
|
||||
edje_object_part_drag_value_get(sd->o_ctrl, "terminology.posdrag", &vx, &vy);
|
||||
media_position_set(data, vx + vy);
|
||||
}
|
||||
|
||||
|
@ -523,14 +518,16 @@ _type_mov_init(Evas_Object *obj)
|
|||
o = sd->o_ctrl = edje_object_add(evas_object_evas_get(obj));
|
||||
theme_apply(o, sd->config, "terminology/mediactrl");
|
||||
vol = emotion_object_audio_volume_get(sd->o_img);
|
||||
mediactrl_volume_drag_value_set(o, vol, vol);
|
||||
mediactrl_play_callback_add(o, _cb_media_play, obj);
|
||||
mediactrl_pause_callback_add(o,
|
||||
_cb_media_pause, obj);
|
||||
mediactrl_stop_callback_add(o, _cb_media_stop, obj);
|
||||
edje_object_part_drag_value_set(o, "terminology.voldrag", vol, vol);
|
||||
edje_object_signal_callback_add(o, "play", "",
|
||||
_cb_media_play, obj);
|
||||
edje_object_signal_callback_add(o, "pause", "",
|
||||
_cb_media_pause, obj);
|
||||
edje_object_signal_callback_add(o, "stop", "",
|
||||
_cb_media_stop, obj);
|
||||
edje_object_signal_callback_add(o, "drag", "terminology.posdrag",
|
||||
_cb_media_pos, obj);
|
||||
edje_object_signal_callback_add(o, "drag", "terminology.volume",
|
||||
edje_object_signal_callback_add(o, "drag", "terminology.voldrag",
|
||||
_cb_media_vol, obj);
|
||||
/* TODO where to stack the object in the ui? controls cannot be part of
|
||||
* the 'media smart obj' becouse controls need to be on top of the term obj.
|
||||
|
@ -801,8 +798,8 @@ _url_compl_cb(void *data, int type __UNUSED__, void *event_info)
|
|||
Media *sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return EINA_TRUE;
|
||||
if (ev->url_con != sd->url) return EINA_TRUE;
|
||||
|
||||
mediabusy_done_emit(sd->o_busy);
|
||||
|
||||
edje_object_signal_emit(sd->o_busy, "done", "terminology");
|
||||
ecore_event_handler_del(sd->url_prog_hand);
|
||||
ecore_event_handler_del(sd->url_compl_hand);
|
||||
ecore_con_url_free(sd->url);
|
||||
|
@ -931,7 +928,7 @@ media_add(Evas_Object *parent, const char *src, const Config *config, int mode,
|
|||
evas_object_smart_member_add(o, obj);
|
||||
theme_apply(o, sd->config, "terminology/mediabusy");
|
||||
evas_object_show(o);
|
||||
mediabusy_busy_emit(o);
|
||||
edje_object_signal_emit(o, "busy", "terminology");
|
||||
|
||||
sd->realf = eina_stringshare_add(buf);
|
||||
sd->url_prog_hand = ecore_event_handler_add
|
||||
|
@ -975,9 +972,9 @@ media_mute_set(Evas_Object *obj, Eina_Bool mute)
|
|||
if ((!sd) || (sd->type != TYPE_MOV)) return;
|
||||
emotion_object_audio_mute_set(sd->o_img, mute);
|
||||
if (mute)
|
||||
mediactrl_mute_set_emit(sd->o_ctrl);
|
||||
edje_object_signal_emit(sd->o_ctrl, "mute,set", "terminology");
|
||||
else
|
||||
mediactrl_mute_unset_emit(sd->o_ctrl);
|
||||
edje_object_signal_emit(sd->o_ctrl, "mute,unset", "terminology");
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -987,9 +984,9 @@ media_play_set(Evas_Object *obj, Eina_Bool play)
|
|||
if ((!sd) || (sd->type != TYPE_MOV)) return;
|
||||
emotion_object_play_set(sd->o_img, play);
|
||||
if (play)
|
||||
mediactrl_play_set_emit(sd->o_ctrl);
|
||||
edje_object_signal_emit(sd->o_ctrl, "play,set", "terminology");
|
||||
else
|
||||
mediactrl_pause_set_emit(sd->o_ctrl);
|
||||
edje_object_signal_emit(sd->o_ctrl, "pause,set", "terminology");
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -1017,7 +1014,7 @@ media_volume_set(Evas_Object *obj, double vol)
|
|||
Media *sd = evas_object_smart_data_get(obj);
|
||||
if ((!sd) || (sd->type != TYPE_MOV)) return;
|
||||
emotion_object_audio_volume_set(sd->o_img, vol);
|
||||
mediactrl_volume_drag_value_set(sd->o_ctrl, vol, vol);
|
||||
edje_object_part_drag_value_set(sd->o_ctrl, "terminology.voldrag", vol, vol);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
#include "config.h"
|
||||
#include "termio.h"
|
||||
|
||||
#include "background_generated.h"
|
||||
|
||||
static Evas_Object *op_frame, *op_box = NULL, *op_toolbar = NULL,
|
||||
*op_opbox = NULL, *op_tbox = NULL, *op_temp = NULL,
|
||||
*op_over = NULL;
|
||||
|
@ -28,7 +26,7 @@ _cb_op_font(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UN
|
|||
{
|
||||
if (mode == 1) return;
|
||||
mode = 1;
|
||||
background_option_details_hide_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -36,7 +34,7 @@ _cb_op_theme(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __U
|
|||
{
|
||||
if (mode == 2) return;
|
||||
mode = 2;
|
||||
background_option_details_hide_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -44,7 +42,7 @@ _cb_op_wallpaper(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
|
|||
{
|
||||
if (mode == 3) return;
|
||||
mode = 3;
|
||||
background_option_details_hide_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -52,7 +50,7 @@ _cb_op_colors(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __
|
|||
{
|
||||
if (mode == 4) return;
|
||||
mode = 4;
|
||||
background_option_details_hide_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -60,7 +58,7 @@ _cb_op_video(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __U
|
|||
{
|
||||
if (mode == 5) return;
|
||||
mode = 5;
|
||||
background_option_details_hide_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -68,7 +66,7 @@ _cb_op_behavior(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
|
|||
{
|
||||
if (mode == 6) return;
|
||||
mode = 6;
|
||||
background_option_details_hide_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -76,7 +74,7 @@ _cb_op_helpers(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event _
|
|||
{
|
||||
if (mode == 7) return;
|
||||
mode = 7;
|
||||
background_option_details_hide_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,hide", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -121,7 +119,7 @@ _cb_opdt_hide_done(void *data, Evas_Object *obj __UNUSED__, const char *sig __UN
|
|||
case 7: options_helpers(op_opbox, data); break;
|
||||
default: break;
|
||||
}
|
||||
background_option_details_show_emit(saved_bg);
|
||||
edje_object_signal_emit(saved_bg, "optdetails,show", "terminology");
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -140,7 +138,7 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
op_opbox = o = elm_box_add(win);
|
||||
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
background_option_details_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.optdetails", o);
|
||||
evas_object_show(o);
|
||||
|
||||
op_frame = o = elm_frame_add(win);
|
||||
|
@ -193,25 +191,25 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
evas_object_show(o);
|
||||
evas_object_smart_callback_add(o, "changed", _cb_op_tmp_chg, config);
|
||||
|
||||
background_options_set(bg, op_frame);
|
||||
edje_object_part_swallow(bg, "terminology.options", op_frame);
|
||||
evas_object_show(op_frame);
|
||||
}
|
||||
else if ((op_opbox) && (!op_out))
|
||||
background_option_details_show_emit(bg);
|
||||
edje_object_signal_emit(bg, "optdetails,show", "terminology");
|
||||
|
||||
if (!op_out)
|
||||
{
|
||||
background_option_details_hide_done_callback_add(bg,
|
||||
_cb_opdt_hide_done,
|
||||
term);
|
||||
edje_object_signal_callback_add(bg, "optdetails,hide,done",
|
||||
"terminology",
|
||||
_cb_opdt_hide_done, term);
|
||||
op_over = o = evas_object_rectangle_add(evas_object_evas_get(win));
|
||||
evas_object_color_set(o, 0, 0, 0, 0);
|
||||
background_dismiss_set(bg, o);
|
||||
edje_object_part_swallow(bg, "terminology.dismiss", o);
|
||||
evas_object_show(o);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
|
||||
_cb_mouse_down, term);
|
||||
|
||||
background_options_show_emit(bg);
|
||||
edje_object_signal_emit(bg, "options,show", "terminology");
|
||||
op_out = EINA_TRUE;
|
||||
elm_object_focus_set(op_toolbar, EINA_TRUE);
|
||||
if (op_del_timer)
|
||||
|
@ -222,13 +220,13 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
|
|||
}
|
||||
else
|
||||
{
|
||||
background_option_details_hide_done_callback_del_full(bg,
|
||||
_cb_opdt_hide_done,
|
||||
NULL);
|
||||
edje_object_signal_callback_del(bg, "optdetails,hide,done",
|
||||
"terminology",
|
||||
_cb_opdt_hide_done);
|
||||
evas_object_del(op_over);
|
||||
op_over = NULL;
|
||||
background_options_hide_emit(bg);
|
||||
background_option_details_hide_emit(bg);
|
||||
edje_object_signal_emit(bg, "options,hide", "terminology");
|
||||
edje_object_signal_emit(bg, "optdetails,hide", "terminology");
|
||||
op_out = EINA_FALSE;
|
||||
elm_object_focus_set(op_frame, EINA_FALSE);
|
||||
elm_object_focus_set(term, EINA_TRUE);
|
||||
|
|
|
@ -7,8 +7,6 @@
|
|||
#include "options_font.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include "fontpreview_generated.h"
|
||||
|
||||
#define TEST_STRING "oislOIS.015!|,"
|
||||
|
||||
static Evas_Object *op_fontslider, *op_fontlist, *op_fsml, *op_fbig;
|
||||
|
@ -86,7 +84,7 @@ static void
|
|||
_cb_op_font_preview_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__)
|
||||
{
|
||||
Evas_Object *o;
|
||||
o = fontpreview_text_preview_get(obj);
|
||||
o = edje_object_part_swallow_get(obj, "terminology.text.preview");
|
||||
if (o) evas_object_del(o);
|
||||
}
|
||||
|
||||
|
@ -100,7 +98,7 @@ _cb_op_font_preview_eval(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
|
|||
char buf[4096];
|
||||
|
||||
if (!evas_object_visible_get(obj)) return;
|
||||
if (fontpreview_text_preview_get(obj)) return;
|
||||
if (edje_object_part_swallow_get(obj, "terminology.text.preview")) return;
|
||||
evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
|
||||
if ((ow < 2) || (oh < 2)) return;
|
||||
evas_output_viewport_get(evas_object_evas_get(obj), &vx, &vy, &vw, &vh);
|
||||
|
@ -120,7 +118,7 @@ _cb_op_font_preview_eval(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
|
|||
evas_object_text_font_set(o, f->name, config->font.size);
|
||||
evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
|
||||
evas_object_size_hint_min_set(o, ow, oh);
|
||||
fontpreview_text_preview_set(obj, o);
|
||||
edje_object_part_swallow(obj, "terminology.text.preview", o);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -191,6 +189,7 @@ _cb_font_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
|
|||
evas_object_event_callback_del_full(term, EVAS_CALLBACK_RESIZE,
|
||||
_cb_term_resize, term);
|
||||
}
|
||||
|
||||
void
|
||||
options_font_clear(void)
|
||||
{
|
||||
|
|
|
@ -14,10 +14,6 @@
|
|||
#include "utils.h"
|
||||
#include "media.h"
|
||||
|
||||
#include "background_generated.h"
|
||||
#include "cursor_generated.h"
|
||||
#include "selection_generated.h"
|
||||
|
||||
typedef struct _Termio Termio;
|
||||
|
||||
struct _Termio
|
||||
|
@ -502,9 +498,7 @@ _smart_apply(Evas_Object *obj)
|
|||
}
|
||||
if (cells[j].att.fgintense) fg += 48;
|
||||
if (cells[j].att.bgintense) bg += 48;
|
||||
if (((codepoint == ' ') || (codepoint == 0)) &&
|
||||
(!cells[j].att.strike) &&
|
||||
(!cells[j].att.underline))
|
||||
if ((codepoint == ' ') || (codepoint == 0))
|
||||
fg = COL_INVIS;
|
||||
}
|
||||
if ((tc[x].codepoint != codepoint) ||
|
||||
|
@ -573,16 +567,15 @@ _smart_apply(Evas_Object *obj)
|
|||
{
|
||||
sd->top_left = EINA_FALSE;
|
||||
sd->bottom_right = EINA_TRUE;
|
||||
mediactrl_mouse_out_emit(sd->cur.selo_theme);
|
||||
selection_top_left_blinking_stop_emit(sd->cur.selo_theme);
|
||||
selection_bottom_right_blinking_emit(sd->cur.selo_theme);
|
||||
edje_object_signal_emit(sd->cur.selo_theme, "mouse,out", "zone.top_left");
|
||||
edje_object_signal_emit(sd->cur.selo_theme, "mouse,in", "zone.bottom_right");
|
||||
}
|
||||
else if (sd->bottom_right)
|
||||
{
|
||||
sd->top_left = EINA_TRUE;
|
||||
sd->bottom_right = EINA_FALSE;
|
||||
selection_bottom_right_blinking_stop_emit(sd->cur.selo_theme);
|
||||
selection_top_left_blinking_emit(sd->cur.selo_theme);
|
||||
edje_object_signal_emit(sd->cur.selo_theme, "mouse,out", "zone.bottom_right");
|
||||
edje_object_signal_emit(sd->cur.selo_theme, "mouse,in", "zone.top_left");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -610,16 +603,23 @@ _smart_apply(Evas_Object *obj)
|
|||
(end_y + 1 - start_y) * sd->font.chh);
|
||||
if ((start_y == end_y) ||
|
||||
((start_x == 0) && (end_x == (sd->grid.w - 1))))
|
||||
selection_mode_oneline_emit(sd->cur.selo_theme);
|
||||
edje_object_signal_emit(sd->cur.selo_theme,
|
||||
"mode,oneline", "terminology");
|
||||
else if ((start_y == (end_y - 1)) &&
|
||||
(start_x > end_x))
|
||||
selection_mode_disjoint_emit(sd->cur.selo_theme);
|
||||
edje_object_signal_emit(sd->cur.selo_theme,
|
||||
"mode,disjoint", "terminology");
|
||||
else if (start_x == 0)
|
||||
selection_mode_topfull_emit(sd->cur.selo_theme);
|
||||
edje_object_signal_emit(sd->cur.selo_theme,
|
||||
"mode,topfull", "terminology");
|
||||
else if (end_x == (sd->grid.w - 1))
|
||||
selection_mode_bottomfull_emit(sd->cur.selo_theme);
|
||||
{
|
||||
edje_object_signal_emit(sd->cur.selo_theme,
|
||||
"mode,bottomfull", "terminology");
|
||||
}
|
||||
else
|
||||
selection_mode_multiline_emit(sd->cur.selo_theme);
|
||||
edje_object_signal_emit(sd->cur.selo_theme,
|
||||
"mode,multiline", "terminology");
|
||||
evas_object_show(sd->cur.selo_theme);
|
||||
}
|
||||
else
|
||||
|
@ -1048,7 +1048,7 @@ _smart_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
|
|||
keyin_handle(sd->pty, ev);
|
||||
end:
|
||||
if (sd->config->flicker_on_key)
|
||||
cursor_key_down_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "key,down", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1072,9 +1072,9 @@ _smart_cb_focus_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
|
|||
sd = evas_object_smart_data_get(data);
|
||||
if (!sd) return;
|
||||
if (sd->config->disable_cursor_blink)
|
||||
cursor_focus_in_noblink_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "focus,in,noblink", "terminology");
|
||||
else
|
||||
cursor_focus_in_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "focus,in", "terminology");
|
||||
if (!sd->win) return;
|
||||
elm_win_keyboard_mode_set(sd->win, ELM_WIN_KEYBOARD_TERMINAL);
|
||||
if (sd->imf)
|
||||
|
@ -1093,7 +1093,7 @@ _smart_cb_focus_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
|
|||
|
||||
sd = evas_object_smart_data_get(data);
|
||||
if (!sd) return;
|
||||
cursor_focus_out_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "focus,out", "terminology");
|
||||
if (!sd->win) return;
|
||||
elm_win_keyboard_mode_set(sd->win, ELM_WIN_KEYBOARD_OFF);
|
||||
if (sd->imf)
|
||||
|
@ -1848,8 +1848,8 @@ _termio_config_set(Evas_Object *obj, Config *config)
|
|||
|
||||
theme_apply(sd->cur.selo_theme, config, "terminology/selection");
|
||||
theme_auto_reload_enable(sd->cur.selo_theme);
|
||||
selection_top_left_set(sd->cur.selo_theme, sd->cur.selo_top);
|
||||
selection_bottom_right_set(sd->cur.selo_theme, sd->cur.selo_bottom);
|
||||
edje_object_part_swallow(sd->cur.selo_theme, "terminology.top_left", sd->cur.selo_top);
|
||||
edje_object_part_swallow(sd->cur.selo_theme, "terminology.bottom_right", sd->cur.selo_bottom);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -2307,7 +2307,7 @@ _smart_pty_bell(void *data)
|
|||
Termio *sd = evas_object_smart_data_get(data);
|
||||
if (!sd) return;
|
||||
evas_object_smart_callback_call(data, "bell", NULL);
|
||||
background_bell_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "bell", "terminology");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -2574,11 +2574,11 @@ termio_config_update(Evas_Object *obj)
|
|||
termpty_backscroll_set(sd->pty, sd->config->scrollback);
|
||||
sd->scroll = 0;
|
||||
|
||||
cursor_focus_out_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "focus,out", "terminology");
|
||||
if (sd->config->disable_cursor_blink)
|
||||
cursor_focus_in_noblink_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "focus,in,noblink", "terminology");
|
||||
else
|
||||
cursor_focus_in_emit(sd->cur.obj);
|
||||
edje_object_signal_emit(sd->cur.obj, "focus,in", "terminology");
|
||||
|
||||
evas_object_scale_set(sd->grid.obj, elm_config_scale_get());
|
||||
evas_object_textgrid_font_set(sd->grid.obj, sd->font.name, sd->font.size);
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
#include "termio.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
||||
static Eina_Bool
|
||||
coord_back(int *x, int *y, int w, int h __UNUSED__)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue