Arch for Freon stack ARM Chromebook

CONTRIBUTORS

@@ -1,22 +1,33 @@
 Alex Bennée
+Alfred Suleymanov
+Andrew Kanner
 Aron Griffis
 Blaine Bublitz
 Chris Galle
+Christopher Mårtensson
 Corey Garst
 David Schneider
 Dennis Lockhart
 dimonf
+dumpweed
+George Shank
 Igor Bukanov
+Javi Merino
 Jim Tittsler
 John Tantalo
+Kenny Strawn
 Maurice van Kruchten
 Micah Lee
 Michael Orr
+Mike Kasick
 Mikito Takada
 Nevada Romsdahl
 Nicolas Boichat
+Samuel Dionne-Riel
 Stephen Barber
 Steven Maude
+Ted Matsumura
 Tobbe Lundberg
 Tony Xue
+Yu-Hsi Chiang
 Yuri Pole

LICENSE

@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The crouton Authors. All rights reserved.
+// Copyright (c) 2015 The crouton Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

Makefile

@@ -1,10 +1,12 @@
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 TARGET = crouton
 EXTTARGET = crouton.zip
-SRCTARGETS = $(patsubst src/%.c,crouton%,$(wildcard src/*.c))
+LIBS = src/freon.c
+LIBSTARGETS = $(patsubst src/%.c, crouton%.so, $(LIBS))
+SRCTARGETS = $(patsubst src/%.c,crouton%,$(filter-out $(LIBS),$(wildcard src/*.c)))
 CONTRIBUTORS = CONTRIBUTORS
 WRAPPER = build/wrapper.sh
 SCRIPTS := \
@@ -15,6 +17,9 @@ SCRIPTS := \
 	$(wildcard installer/*/*) \
 	$(wildcard src/*) \
 	$(wildcard targets/*)
+EXTPEXE = host-ext/crouton/kiwi.pexe
+EXTPEXESOURCES = $(wildcard host-ext/nacl_src/*.h) \
+				 $(wildcard host-ext/nacl_src/*.cc)
 EXTSOURCES = $(wildcard host-ext/crouton/*)
 GENVERSION = build/genversion.sh
 CONTRIBUTORSSED = build/CONTRIBUTORS.sed
@@ -28,6 +33,7 @@ croutoncursor_LIBS = -lX11 -lXfixes -lXrender
 croutonfbserver_LIBS = -lX11 -lXdamage -lXext -lXfixes -lXtst
 croutonwmtools_LIBS = -lX11
 croutonxi2event_LIBS = -lX11 -lXi
+croutonfreon.so_LIBS = -ldl
 
 croutonwebsocket_DEPS = src/websocket.h
 croutonfbserver_DEPS = src/websocket.h
@@ -56,13 +62,19 @@ $(TARGET): $(WRAPPER) $(SCRIPTS) $(GENVERSION) $(GITHEAD) Makefile
 $(EXTTARGET): $(EXTSOURCES) Makefile
 	rm -f $(EXTTARGET) && zip -q --junk-paths $(EXTTARGET) $(EXTSOURCES)
 
-$(SRCTARGETS): src/$(patsubst crouton%,src/%.c,$@) $($@_DEPS) Makefile
+$(EXTPEXE): $(EXTPEXESOURCES)
+	$(MAKE) -C host-ext/nacl_src
+
+$(SRCTARGETS): $(patsubst crouton%,src/%.c,$@) $($@_DEPS) Makefile
 	gcc $(CFLAGS) $(patsubst crouton%,src/%.c,$@) $($@_LIBS) -o $@
 
+$(LIBSTARGETS): $(patsubst crouton%.so,src/%.c,$@) $($@_DEPS) Makefile
+	gcc $(CFLAGS) -shared -fPIC $(patsubst crouton%.so,src/%.c,$@) $($@_LIBS) -o $@
+
 extension: $(EXTTARGET)
 
 $(CONTRIBUTORS): $(GITHEAD) $(CONTRIBUTORSSED)
-	git shortlog -s | sed -f $(CONTRIBUTORSSED) | sort -u > $(CONTRIBUTORS)
+	git shortlog -s | sed -f $(CONTRIBUTORSSED) | sort -uf > $(CONTRIBUTORS)
 
 contributors: $(CONTRIBUTORS)
 
@@ -74,9 +86,9 @@ release: $(CONTRIBUTORS) $(TARGET) $(RELEASE)
 force-release: $(CONTRIBUTORS) $(TARGET) $(RELEASE)
 	$(RELEASE) -f $(TARGET)
 
-all: $(TARGET) $(SRCTARGETS) $(EXTTARGET)
+all: $(TARGET) $(SRCTARGETS) $(LIBSTARGETS) $(EXTTARGET)
 
 clean:
-	rm -f $(TARGET) $(EXTTARGET) $(SRCTARGETS)
+	rm -f $(TARGET) $(EXTTARGET) $(SRCTARGETS) $(LIBSTARGETS)
 
 .PHONY: all clean contributors extension release force-release

README.md

@@ -192,7 +192,7 @@ Examples
   2. Run `sh ~/Downloads/crouton -r list` to list the recognized releases and
      which distros they belong to.
 
-### Wasteful rendundancies are wasteful: one clipboard, one browser, one window
+### Wasteful redundancies are wasteful: one clipboard, one browser, one window
   1. Install the [crouton extension](https://goo.gl/OVQOEt) into Chromium OS.
   2. Add the `extension` or `xiwi` version to your chroot.
   3. Try some copy-pasta, or uninstall all your web browsers from the chroot.
@@ -355,7 +355,7 @@ There's a way For Everyone to help!
 
 License
 -------
-crouton (including this eloquently-written README) is copyright © 2014 The
+crouton (including this eloquently-written README) is copyright © 2015 The
 crouton Authors. All rights reserved. Use of the source code included here is
 governed by a BSD-style license that can be found in the LICENSE file in the
 source tree.

build/CONTRIBUTORS.sed

@@ -1,6 +1,8 @@
 s/^[ \t0-9]*//
 s/^DennisL.*$/Dennis Lockhart/
 s/^divx118$/Maurice van Kruchten/
+s/^tedm$/Ted Matsumura/
 /^root$/d
 /^ttk153$/d
 /^lnxsrt$/d
+/\?/d

build/genversion.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 

build/release.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 

build/wrapper.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file of the source repository, which has been replicated
 # below for convenience of distribution:

chroot-bin/brightness

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 

chroot-bin/crouton-noroot

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 

chroot-bin/crouton-unity-autostart

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #

chroot-bin/croutonclip

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #

chroot-bin/croutoncycle

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2014 The crouton Authors. All rights reserved.
+# Copyright (c) 2015 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -76,9 +76,6 @@ export XAUTHORITY=''
 # Set to y if there is any xiwi instance running
 xiwiactive=''
 
-# Set to y if aura is running without a X server
-noaurax=''
-
 # Prepare display list for easier looping
 displist=''
 for disp in /tmp/.X*-lock; do
@@ -91,33 +88,36 @@ for disp in /tmp/.X*-lock; do
             | grep -q 'INTEGER'; then
         displist="$displist $disp"
     elif DISPLAY="$disp" xprop -root 'CROUTON_XMETHOD' 2>/dev/null \
-            | grep -q '= "xiwi"$'; then
+            | grep -q '= "xiwi'; then
         displist="$displist $disp"
         xiwiactive='y'
     fi
 done
 
-# host-x11 fails if no Chromium OS server exist
-if host-x11 true 2>/dev/null; then
+# Set to the freon display owner if freon is used
+freonowner=''
+if [ ! -f "/sys/class/tty/tty0/active" ]; then
+    if [ -f "/tmp/crouton-lock/display" ]; then
+        read -r freonowner < "/tmp/crouton-lock/display"
+    fi
+    freonowner="${freonowner:-0}"
+    winlist="aura*"
+    aurawin="aura"
+    tty=''
+else
     # List windows on :0. Includes aura
     winlist="`host-x11 croutonwmtools list nim | \
               sort | awk '{ printf $NF " " }'`"
     aurawin="`host-x11 croutonwmtools list ni | \
               awk '$1 == "aura_root_0" { print $NF; exit }'`"
     tty="`cat '/sys/class/tty/tty0/active'`"
-else
-    # No X11 server
-    noaurax='y'
-    winlist="aura*"
-    aurawin="aura"
-    tty="tty1"
 fi
 
 # Combine the two
 fulllist="$winlist$displist"
 fulllist="${fulllist% }"
 
-if [ "$tty" = 'tty1' ]; then
+if [ "$freonowner" = 0 -o "$tty" = 'tty1' ]; then
     # Either in Chromium OS, xephyr/xiwi chroot, or window.
     # Active window is starred.
     for disp in $winlist; do
@@ -133,7 +133,7 @@ if [ "$tty" = 'tty1' ]; then
             break
         fi
     done
-else
+elif [ -z "$freonowner" ]; then
     # Poll the displays to figure out which one owns this VT
     curdisp="$tty"
     for disp in $displist; do
@@ -143,6 +143,14 @@ else
             break
         fi
     done
+else
+    # Match the pid to the current freon owner
+    for lockfile in /tmp/.X*-lock; do
+        if grep -q "\\<$freonowner$" "$lockfile"; then
+            curdisp="${lockfile#*X}"
+            curdisp=":${curdisp%%-*}"
+        fi
+    done
 fi
 
 # List the displays if requested
@@ -153,13 +161,14 @@ if [ "$cmd" = 'l' -o "$cmd" = 'd' ]; then
                              '/var/host/lsb-release'`"
     fi
     (
-        if [ -z "$noaurax" ]; then
+        if [ -z "$freonowner" ]; then
             host-x11 croutonwmtools list nim
         else
             echo "aura_root_0 aura*"
         fi
     ) | sort | while read -r line; do
         disp="${line##* }"
+        display="${disp%"*"}"
         line="${line% *}"
         number='0'
         active=' '
@@ -169,7 +178,7 @@ if [ "$cmd" = 'l' -o "$cmd" = 'd' ]; then
             if [ "${number#[0-9]}" = "$number" ]; then
                 number='0'
             else
-                disp=":$number"
+                display=":$number"
                 line="`getname "$number"`"
             fi
         fi
@@ -187,11 +196,11 @@ if [ "$cmd" = 'l' -o "$cmd" = 'd' ]; then
         fi
         if [ "$line" = 'aura_root_0' ]; then
             line="$chromiumos"
-            disp="cros"
+            display="cros"
             window=''
         fi
         if [ "$cmd" = 'l' ]; then
-            echo "${disp%"*"}$active $line"
+            echo "$display$active $line"
         fi
     done
     for disp in $displist; do
@@ -216,6 +225,12 @@ fi
 if [ -n "${cmd#[pn]}" ]; then
     if [ "${cmd#:}" != "$cmd" ]; then
         destdisp="$cmd"
+        # Resolve a xephyr display into its ID
+        if DISPLAY="$destdisp" xprop -root 'CROUTON_XMETHOD' 2>/dev/null \
+                | grep -q '= "xephyr"$'; then
+            destdisp="`host-x11 croutonwmtools list ni | \
+                       awk "/^Xephyr on $destdisp\.0/"' { print $NF; exit }'`"
+        fi
     else
         i=0
         destdisp=''
@@ -261,22 +276,24 @@ if [ "$destdisp" = "$curdisp" -a -z "$force" ]; then
 fi
 
 # Make sure tap-to-click is enabled
-if [ -z "$noaurax" ] && hash xinput 2>/dev/null; then
+if [ -z "$freonowner" ] && hash xinput 2>/dev/null; then
     for id in `host-x11 xinput --list --id-only`; do
         host-x11 xinput set-prop "$id" 'Tap Paused' 0 2>/dev/null || true
     done
 fi
 
 # Determine if the target display is on a VT
 if [ "${destdisp#:}" = "$destdisp" ]; then
-    if [ -z "$noaurax" ]; then
+    if [ -z "$freonowner" ]; then
         eval "`host-x11`"
         # Raise the right window after chvting, so that it can update
         if [ "$tty" != 'tty1' ]; then
             sudo -n chvt 1
             sleep .1
         fi
         croutonwmtools raise "${destdisp%"*"}"
+    elif [ "${freonowner:-0}" != 0 ]; then
+        kill -USR1 "$freonowner"
     fi
 
     if [ -n "$xiwiactive" -a "${destdisp%"*"}" = "$aurawin" ]; then
@@ -287,16 +304,23 @@ if [ "${destdisp#:}" = "$destdisp" ]; then
     fi
 else
     export DISPLAY="$destdisp"
-    if xprop -root 'CROUTON_XMETHOD' 2>/dev/null | grep -q '= "xiwi"$'; then
-        if [ -z "$noaurax" -a "$tty" != 'tty1' ]; then
+    xmethod="`xprop -root 'CROUTON_XMETHOD' 2>/dev/null \
+              | sed -n 's/^.*\"\(.*\)\"/\1/p'`"
+    if [ "${xmethod%%-*}" = 'xiwi' ]; then
+        if [ -z "$freonowner" -a "$tty" != 'tty1' ]; then
             sudo -n chvt 1
             sleep .1
+        elif [ "${freonowner:-0}" != 0 ]; then
+            kill -USR1 "$freonowner"
+        fi
+        if [ -z "$freonowner" ]; then
+            host-x11 croutonwmtools raise "$aurawin"
         fi
-        STATUS="`echo -n "X${destdisp}" | websocketcommand`"
+        STATUS="`echo -n "X${destdisp} ${xmethod#*-}" | websocketcommand`"
         if [ "$STATUS" != 'XOK' ]; then
             error 1 "${STATUS#?}"
         fi
-    else
+    elif [ -z "$freonowner" ]; then
         dest="`xprop -root 'XFree86_VT' 2>/dev/null`"
         dest="${dest##* }"
         if [ "${dest#[1-9]}" = "$dest" ]; then
@@ -307,6 +331,15 @@ else
         # display will be stuck on the old vt.
         sudo -n chvt 2
         sudo -n chvt "$dest"
+    else
+        dest="/tmp/.X${destdisp#:}-lock"
+        if [ -f "$dest" ]; then
+            # Trigger the target before releasing the current owner
+            kill -USR1 `cat /tmp/.X${destdisp#:}-lock`
+        fi
+        if [ "${freonowner:-0}" != 0 ]; then
+            kill -USR1 "$freonowner"
+        fi
     fi
 fi