transition log_fader from xray_trigger to global_keys_handler

Ref #91
This commit is contained in:
Emery Hemingway
2017-11-27 20:07:46 -06:00
parent 9f98f503b1
commit 6237c74383

View File

@@ -17,7 +17,7 @@ set build_components {
app/launchpad app/launchpad
app/pointer app/pointer
app/rom_logger app/rom_logger
app/xray_trigger app/global_keys_handler
drivers/framebuffer drivers/framebuffer
drivers/timer drivers/timer
server/log_tee server/log_tee
@@ -80,9 +80,10 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides> <provides> <service name="Report"/> <service name="ROM"/> </provides>
<config> <config>
<policy label="xray_trigger -> hover" report="nitpicker -> hover"/> <policy label="global_keys_handler -> hover" report="nitpicker -> hover"/>
<policy label="nitpicker_config -> xray" report="xray_trigger -> xray"/> <policy label="decorator_config -> xray" report="global_keys_handler -> xray"/>
<policy label="log_fader_config -> xray" report="xray_trigger -> xray"/> <policy label="nitpicker_config -> xray" report="global_keys_handler -> xray"/>
<policy label="log_fader_config -> xray" report="global_keys_handler -> xray"/>
</config> </config>
<route> <any-service> <parent/> <any-child/> </any-service> </route> <route> <any-service> <parent/> <any-child/> </any-service> </route>
</start> </start>
@@ -119,14 +120,16 @@ append config {
<policy label_prefix="log_" domain="log"/> <policy label_prefix="log_" domain="log"/>
<policy label_prefix="pointer" domain="pointer"/> <policy label_prefix="pointer" domain="pointer"/>
<default-policy domain="default"/> <default-policy domain="default"/>
<global-key name="KEY_SCROLLLOCK" label="xray_trigger -> input"/> <global-key name="KEY_SCROLLLOCK" label="global_keys_handler -> input"/>
<global-key name="KEY_F1" label="xray_trigger -> input" /> <global-key name="KEY_F1" label="global_keys_handler -> input" />
<global-key name="KEY_F2" label="xray_trigger -> input" /> <global-key name="KEY_F2" label="global_keys_handler -> input" />
</inline> </inline>
</output> </output>
</config> </config>
<route> <route>
<service name="ROM" label="xray"> <child name="report_rom"/> </service> <service name="ROM" label="xray">
<child name="report_rom"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
</start> </start>
@@ -144,19 +147,26 @@ append config {
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
<start name="global_keys_handler">
<start name="xray_trigger">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<config> <config>
<press name="KEY_F1" xray="on"/> <bool name="xray" initial="no"/>
<release name="KEY_F1" xray="off"/>
<press name="KEY_F2" xray="toggle"/> <press name="KEY_SCROLLLOCK" bool="xray" change="toggle"/>
<hover domain="panel"/> <press name="KEY_F1" bool="xray" change="on"/>
<release name="KEY_F1" bool="xray" change="off"/>
<press name="KEY_F2" bool="xray" change="toggle"/>
<report name="xray" delay_ms="125">
<hovered domain="panel"/>
<hovered domain="decorator"/>
<bool name="xray"/>
</report>
</config> </config>
<route> <route>
<service name="Nitpicker"> <child name="nitpicker"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="ROM" label="hover"> <child name="report_rom"/> </service> <service name="ROM" label="hover"> <child name="report_rom"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
@@ -248,14 +258,14 @@ append config {
</route> </route>
</start> </start>
<start name="launchpad"> <start name="launchpad" caps="512">
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="32M"/>
<config> <config>
<launcher name="testnit" ram_quota="768K" /> <launcher name="testnit" ram_quota="768K" caps="128"/>
<launcher name="rom_logger" ram_quota="768K"> <launcher name="rom_logger" ram_quota="768K" caps="128">
<config rom="nitpicker.config"/> <config rom="nitpicker.config"/>
</launcher> </launcher>
<launcher name="rom_logger" ram_quota="768K"> <launcher name="rom_logger" ram_quota="768K" caps="128">
<config rom="log_fader.config"/> <config rom="log_fader.config"/>
</launcher> </launcher>
</config> </config>
@@ -286,7 +296,7 @@ set boot_modules {
terminal_log terminal_log
testnit testnit
timer timer
xray_trigger global_keys_handler
} }
build_boot_image $boot_modules build_boot_image $boot_modules