From aa40558c3db841664a8164ee281db6d1e2e15e62 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 22 Mar 2012 14:35:10 +0000 Subject: [PATCH] Delete unix_test_app directory and its contents. Leon added this in March 2011 ( http://code.google.com/p/skia/source/detail?spec=svn938&r=938 ), but it's not maintained anymore. Review URL: https://codereview.appspot.com/5876055 git-svn-id: http://skia.googlecode.com/svn/trunk@3463 2bbb7eff-a529-9590-31e7-b0007b416f81 --- unix_test_app/DrawBlueSample.cpp | 34 ------------------ unix_test_app/main.cpp | 62 -------------------------------- unix_test_app/makefile | 48 ------------------------- 3 files changed, 144 deletions(-) delete mode 100644 unix_test_app/DrawBlueSample.cpp delete mode 100644 unix_test_app/main.cpp delete mode 100644 unix_test_app/makefile diff --git a/unix_test_app/DrawBlueSample.cpp b/unix_test_app/DrawBlueSample.cpp deleted file mode 100644 index 83e6fd5eab..0000000000 --- a/unix_test_app/DrawBlueSample.cpp +++ /dev/null @@ -1,34 +0,0 @@ - -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "SampleCode.h" -#include "SkCanvas.h" -#include "SkColor.h" -#include "SkEvent.h" -#include "SkView.h" - -class DrawBlue : public SkView { - -public: - DrawBlue() {} -protected: - virtual void onDraw(SkCanvas* canvas) { - canvas->drawColor(SK_ColorBLUE); - } - virtual bool onQuery(SkEvent* evt) { - if (SampleCode::TitleQ(*evt)) { - SampleCode::TitleR(evt, "DrawBlue"); - return true; - } - return this->INHERITED::onQuery(evt); - } -private: - typedef SkView INHERITED; -}; - -static SkView* MyFactory() { return new DrawBlue; } -static SkViewRegister reg(MyFactory); diff --git a/unix_test_app/main.cpp b/unix_test_app/main.cpp deleted file mode 100644 index 108e9ac206..0000000000 --- a/unix_test_app/main.cpp +++ /dev/null @@ -1,62 +0,0 @@ - -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "X11/Xlib.h" -#include "X11/keysym.h" - -#include "SkApplication.h" -#include "SkEvent.h" -#include "SkWindow.h" -#include "SkTypes.h" - -#include -#include - -SkOSWindow* gWindow; - -static void catch_alarm(int sig) -{ - SkEvent::ServiceQueueTimer(); -} - -int main(int argc, char** argv){ - signal(SIGALRM, catch_alarm); - - gWindow = create_sk_window(NULL, argc, argv); - - // drain any events that occurred before gWindow was assigned. - while (SkEvent::ProcessEvent()); - - // Start normal Skia sequence - application_init(); - - gWindow->loop(); - - delete gWindow; - application_term(); - return 0; -} - -// SkEvent handlers - -void SkEvent::SignalNonEmptyQueue() -{ - if (gWindow) { - gWindow->post_linuxevent(); - } -} - -void SkEvent::SignalQueueTimer(SkMSec delay) -{ - itimerval newTimer; - newTimer.it_interval.tv_sec = 0; - newTimer.it_interval.tv_usec = 0; - newTimer.it_value.tv_sec = 0; - newTimer.it_value.tv_usec = delay * 1000; - - setitimer(ITIMER_REAL, &newTimer, NULL); -} diff --git a/unix_test_app/makefile b/unix_test_app/makefile deleted file mode 100644 index 7b28203382..0000000000 --- a/unix_test_app/makefile +++ /dev/null @@ -1,48 +0,0 @@ -# Build the unix test app - -C_INCLUDES := -I../include/core \ - -I../include/config \ - -I../include/effects \ - -I../include/images \ - -I../include/utils \ - -I../include/views \ - -I../include/xml \ - -I../include/gpu \ - -I../gpu/include \ - -I../include/utils/unix \ - -I../samplecode \ - -I../src/core - -VPATH = libs:../src/ports:../samplecode:../src/core:../src/utils/unix - -#generate debugging info -CFLAGS = -g - -SRC_LIST := main.cpp SkOSWindow_Unix.cpp SkXMLParser_empty.cpp SkDebug.cpp ../gpu/src/unix/GrGLDefaultInterface_unix.cpp - -#views files -include ../src/views/views_files.mk -SRC_LIST += $(addprefix ../src/views/, $(SOURCE)) - -#xml -include ../src/xml/xml_files.mk -SRC_LIST += $(addprefix ../src/xml/, $(SOURCE)) - -#include the samples -include ../samplecode/samplecode_files.mk -SRC_LIST += $(addprefix ../samplecode/, $(SOURCE)) - - -out/output: $(SRC_LIST) out/keysym2ucs.o ../out/libskia.a -lX11 -lpthread -lz -lfreetype -lGL -lpng - g++ $(C_INCLUDES) $(CFLAGS) $^ -o $@ - -out/keysym2ucs.o: ../src/utils/unix/keysym2ucs.c - @mkdir -p $(dir $@) - @gcc -c $(C_INCLUDES) $(CFLAGS) $^ -o $@ - -../out/libskia.a: - @$(MAKE) -C ../ SKIA_SAMPLES_FOR_X=true - -clean: - rm -rf ../out # Copied from ../Makefile - rm -rf out