diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 3d96a05b..9e017c5d 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include noinst_LIBRARIES = libgui.a -libgui_a_SOURCES = sdlmain.cpp sdl_mapper.cpp \ +libgui_a_SOURCES = sdlmain.cpp sdl_mapper.cpp dosbox_logo.h \ render.cpp render_scalers.cpp render_scalers.h \ render_templates.h render_loops.h \ midi.cpp midi_win32.h midi_oss.h midi_coreaudio.h midi_alsa.h diff --git a/src/gui/dosbox_logo.h b/src/gui/dosbox_logo.h new file mode 100644 index 00000000..50aba157 --- /dev/null +++ b/src/gui/dosbox_logo.h @@ -0,0 +1,539 @@ +/* + * Copyright (C) 2002-2006 The DOSBox Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* $Id: dosbox_logo.h,v 1.1 2006-02-09 08:42:42 qbix79 Exp $ */ + +/* Select only one logo at the time */ +#define LOGO_1 1 +//#define LOGO_2 1 +#ifdef LOGO_1 +64 , 46, 30,0, 64, 46, 30,0, 91, 61, 37,0, 91, 61, 37,0 +, 91, 61, 37,0, 89, 60, 37,0, 94, 62, 37,0, 95, 62, 36,0 +, 94, 62, 37,0, 94, 62, 37,0, 95, 64, 39,0, 95, 64, 39,0 +, 95, 64, 39,0, 95, 64, 39,0, 94, 62, 37,0, 94, 62, 37,0 +, 88, 58, 34,0, 88, 58, 34,0, 94, 62, 37,0, 94, 62, 37,0 +, 91, 61, 37,0, 91, 61, 36,0, 91, 61, 36,0, 88, 58, 34,0 +, 91, 60, 35,0, 91, 60, 35,0, 82, 53, 31,0, 82, 53, 31,0 +, 86, 56, 32,0, 86, 56, 32,0, 61, 42, 27,0, 61, 42, 27,0 +, 64, 46, 30,0, 64, 46, 30,0, 91, 61, 37,0, 91, 61, 37,0 +, 89, 60, 37,0, 89, 60, 37,0, 95, 62, 36,0, 95, 62, 36,0 +, 94, 62, 37,0, 94, 62, 37,0, 95, 64, 39,0, 95, 64, 39,0 +, 95, 64, 39,0, 95, 64, 39,0, 94, 62, 37,0, 94, 62, 37,0 +, 88, 58, 34,0, 88, 58, 34,0, 94, 62, 37,0, 94, 62, 37,0 +, 91, 61, 37,0, 91, 61, 37,0, 91, 61, 36,0, 91, 61, 36,0 +, 91, 60, 35,0, 91, 60, 35,0, 82, 53, 31,0, 82, 53, 31,0 +, 86, 56, 32,0, 86, 56, 32,0, 61, 42, 27,0, 61, 42, 27,0 +, 79, 53, 33,0, 79, 53, 33,0,142, 95, 58,0,142, 95, 58,0 +,139, 82, 43,0,139, 82, 43,0,129, 77, 39,0,129, 77, 39,0 +,132, 82, 44,0,132, 82, 44,0,143, 91, 49,0,143, 91, 49,0 +,132, 82, 44,0,132, 82, 44,0,129, 77, 40,0,129, 77, 40,0 +,112, 69, 36,0,112, 69, 36,0,136, 85, 45,0,136, 85, 45,0 +,136, 86, 47,0,136, 86, 47,0,119, 75, 39,0,119, 75, 39,0 +,119, 73, 38,0,119, 73, 38,0,125, 76, 39,0,125, 76, 39,0 +,131, 85, 49,0,131, 85, 49,0, 82, 53, 31,0, 82, 53, 31,0 +, 79, 53, 33,0, 79, 53, 33,0,142, 95, 58,0,142, 95, 58,0 +,139, 82, 43,0,139, 82, 43,0,129, 77, 39,0,129, 77, 39,0 +,132, 82, 44,0,129, 77, 40,0,143, 91, 49,0,143, 91, 49,0 +,132, 82, 44,0,132, 82, 44,0,129, 77, 40,0,129, 77, 40,0 +,112, 69, 36,0,112, 69, 36,0,136, 85, 45,0,136, 85, 45,0 +,136, 86, 47,0,136, 85, 45,0,119, 75, 39,0,119, 75, 39,0 +,119, 73, 38,0,119, 73, 38,0,125, 76, 39,0,125, 76, 39,0 +,131, 85, 49,0,131, 85, 49,0, 82, 53, 31,0, 82, 53, 31,0 +, 77, 50, 31,0, 77, 50, 31,0,141, 82, 43,0,141, 82, 43,0 +,255,229, 42,0,255,229, 42,0,255,238, 87,0,255,238, 88,0 +,125, 98, 52,0,125, 98, 52,0,145,120, 69,0,145,120, 69,0 +,133,105, 55,0,133,105, 55,0,255,233, 60,0,255,233, 60,0 +,255,238, 88,0,255,238, 88,0,127,100, 53,0,127,100, 53,0 +,143,117, 67,0,143,117, 67,0,132,105, 55,0,132,105, 55,0 +,255,234, 67,0,255,234, 67,0,255,238, 89,0,255,238, 89,0 +, 83, 49, 23,0, 81, 47, 23,0, 76, 49, 27,0, 82, 51, 26,0 +, 77, 50, 31,0, 79, 53, 33,0,141, 82, 43,0,141, 82, 43,0 +,255,229, 42,0,255,229, 42,0,255,238, 88,0,255,238, 88,0 +,125, 98, 52,0,125, 98, 52,0,145,120, 69,0,145,120, 69,0 +,133,105, 55,0,133,105, 55,0,255,233, 60,0,255,233, 60,0 +,255,238, 88,0,255,238, 88,0,127,100, 53,0,127,100, 53,0 +,143,117, 67,0,143,117, 67,0,132,105, 55,0,132,105, 55,0 +,255,234, 67,0,255,235, 73,0,255,238, 89,0,255,238, 89,0 +, 83, 49, 23,0, 81, 47, 23,0, 80, 50, 27,0, 80, 50, 27,0 +, 77, 50, 31,0, 77, 50, 31,0,143, 78, 37,0,143, 78, 37,0 +,255,229, 43,0,255,229, 42,0, 82, 56, 21,0, 82, 56, 21,0 +,255,238, 88,0,255,238, 88,0, 97, 72, 30,0, 97, 72, 30,0 +,255,233, 60,0,255,233, 60,0, 16, 12, 5,0, 16, 12, 5,0 +,102, 75, 32,0,102, 75, 32,0,255,238, 88,0,255,238, 88,0 +,107, 80, 36,0,107, 80, 36,0,255,224, 13,0,255,224, 13,0 +, 65, 45, 19,0, 65, 45, 19,0, 47, 37, 16,0, 48, 38, 19,0 +, 63, 35, 14,0, 63, 35, 14,0, 77, 46, 22,0, 77, 46, 22,0 +, 77, 51, 30,0, 77, 51, 30,0,143, 78, 37,0,143, 78, 37,0 +,255,229, 43,0,255,229, 42,0, 82, 56, 21,0, 82, 56, 21,0 +,255,238, 88,0,255,238, 88,0, 97, 72, 30,0, 98, 75, 35,0 +,255,233, 60,0,255,233, 60,0, 16, 12, 5,0, 16, 12, 5,0 +,102, 75, 32,0,102, 75, 32,0,255,238, 88,0,255,238, 88,0 +,107, 80, 36,0,107, 80, 36,0,255,224, 13,0,255,224, 13,0 +, 65, 45, 19,0, 65, 45, 19,0, 47, 37, 16,0, 47, 37, 16,0 +, 63, 35, 14,0, 63, 35, 14,0, 77, 46, 22,0, 77, 46, 22,0 +, 82, 53, 31,0, 82, 53, 31,0,144, 81, 38,0,143, 77, 35,0 +,255,231, 49,0,255,231, 49,0, 14, 11, 3,0, 16, 12, 3,0 +,255,238, 88,0,255,238, 88,0, 62, 48, 12,0, 62, 48, 12,0 +,255,238, 89,0,255,238, 89,0, 27, 21, 8,0, 27, 21, 8,0 +,109, 84, 35,0,106, 84, 35,0,255,238, 88,0,255,238, 88,0 +, 11, 8, 3,0, 11, 8, 3,0,106, 84, 35,0,106, 84, 35,0 +,255,238, 88,0,255,238, 87,0, 98, 75, 35,0, 98, 75, 35,0 +,100, 54, 18,0,100, 54, 18,0, 82, 51, 26,0, 77, 46, 22,0 +, 82, 53, 31,0, 82, 53, 31,0,143, 77, 35,0,143, 77, 35,0 +,255,231, 49,0,255,231, 49,0, 14, 11, 3,0, 16, 12, 3,0 +,255,238, 88,0,255,238, 88,0, 62, 48, 12,0, 62, 48, 12,0 +,255,238, 89,0,255,238, 89,0, 27, 21, 8,0, 27, 21, 8,0 +,106, 84, 35,0,106, 84, 35,0,255,238, 88,0,255,238, 88,0 +, 11, 8, 3,0, 11, 8, 3,0,106, 84, 35,0,106, 84, 35,0 +,255,238, 87,0,255,238, 87,0, 98, 75, 35,0, 98, 75, 35,0 +,100, 54, 18,0,100, 54, 18,0, 79, 47, 22,0, 82, 51, 26,0 +, 77, 51, 30,0, 82, 53, 31,0,135, 73, 33,0,135, 73, 33,0 +,255,232, 57,0,255,232, 57,0, 2, 2, 1,0, 2, 2, 1,0 +,255,238, 88,0,255,238, 88,0, 75, 58, 13,0, 75, 58, 13,0 +,255,238, 89,0,255,238, 89,0, 80, 62, 19,0, 80, 62, 19,0 +, 82, 64, 22,0, 82, 64, 22,0,255,238, 88,0,255,238, 89,0 +, 2, 2, 1,0, 2, 2, 1,0,111, 86, 36,0,111, 86, 36,0 +, 88, 63, 23,0, 88, 63, 23,0,255,238, 88,0,255,238, 88,0 +, 62, 33, 10,0, 62, 33, 10,0, 83, 49, 23,0, 83, 49, 23,0 +, 77, 51, 30,0, 77, 51, 30,0,135, 73, 33,0,135, 73, 33,0 +,255,232, 57,0,255,232, 57,0, 2, 2, 1,0, 2, 2, 1,0 +,255,238, 89,0,255,238, 88,0, 75, 58, 13,0, 75, 58, 13,0 +,255,238, 88,0,255,238, 88,0, 80, 62, 19,0, 80, 62, 19,0 +, 82, 64, 22,0, 82, 64, 22,0,255,238, 88,0,255,238, 88,0 +, 2, 2, 1,0, 2, 2, 1,0,111, 86, 36,0,111, 86, 36,0 +, 88, 63, 23,0, 88, 63, 23,0,255,238, 88,0,255,238, 88,0 +, 62, 33, 10,0, 62, 33, 10,0, 83, 49, 23,0, 83, 49, 23,0 +, 79, 52, 30,0, 76, 49, 27,0,144, 81, 40,0,144, 81, 40,0 +,255,238, 87,0,255,238, 87,0,255,238, 88,0,255,238, 88,0 +, 57, 46, 20,0, 57, 44, 14,0,111, 87, 27,0,111, 87, 27,0 +,104, 80, 30,0,104, 80, 30,0,255,238, 88,0,255,238, 88,0 +,255,238, 87,0,255,238, 88,0, 47, 37, 16,0, 47, 37, 16,0 +,116, 91, 38,0,116, 91, 38,0,255,238, 88,0,255,238, 88,0 +,255,238, 88,0,255,238, 88,0, 38, 30, 13,0, 38, 30, 13,0 +, 53, 28, 9,0, 53, 28, 9,0, 77, 46, 22,0, 81, 47, 23,0 +, 76, 49, 27,0, 76, 49, 27,0,144, 81, 40,0,144, 81, 40,0 +,255,238, 87,0,255,238, 87,0,255,238, 87,0,255,238, 87,0 +, 57, 44, 14,0, 57, 44, 14,0,111, 87, 27,0,111, 87, 27,0 +,104, 80, 30,0,104, 80, 30,0,255,238, 88,0,255,238, 88,0 +,255,238, 88,0,255,238, 88,0, 47, 37, 16,0, 47, 37, 16,0 +,116, 91, 38,0,116, 91, 38,0,255,238, 88,0,255,238, 88,0 +,255,238, 88,0,255,238, 88,0, 38, 30, 13,0, 38, 30, 13,0 +, 53, 28, 9,0, 53, 28, 9,0, 83, 49, 23,0, 77, 46, 22,0 +, 82, 53, 31,0, 82, 53, 31,0,153, 91, 46,0,153, 91, 46,0 +,125,101, 52,0,125,101, 52,0, 63, 50, 23,0, 57, 46, 20,0 +, 66, 51, 23,0, 66, 51, 23,0,140,115, 53,0,140,115, 53,0 +,134,109, 51,0,134,109, 51,0,118, 94, 41,0,118, 94, 41,0 +, 47, 37, 16,0, 47, 37, 16,0, 63, 50, 23,0, 63, 50, 23,0 +,129,105, 46,0,129,105, 46,0,114, 92, 41,0,114, 92, 41,0 +, 71, 57, 25,0, 71, 57, 25,0, 68, 52, 26,0, 68, 52, 26,0 +,105, 55, 18,0,105, 55, 18,0, 82, 51, 26,0, 79, 47, 22,0 +, 79, 53, 33,0, 77, 51, 30,0,153, 91, 46,0,153, 91, 46,0 +,125,101, 52,0,125,101, 52,0, 57, 46, 20,0, 57, 46, 20,0 +, 66, 51, 23,0, 66, 51, 23,0,140,115, 53,0,140,115, 53,0 +,134,109, 51,0,134,109, 51,0,118, 94, 41,0,118, 94, 41,0 +, 47, 38, 16,0, 47, 37, 16,0, 63, 50, 23,0, 63, 50, 23,0 +,129,105, 46,0,129,105, 46,0,114, 92, 41,0,114, 92, 41,0 +, 71, 57, 25,0, 71, 57, 25,0, 68, 52, 26,0, 68, 52, 26,0 +,105, 55, 18,0,100, 54, 18,0, 82, 51, 26,0, 82, 51, 26,0 +, 77, 51, 30,0, 82, 53, 31,0,158, 96, 50,0,158, 96, 50,0 +,130,104, 57,0,130,104, 57,0,123, 98, 47,0,123, 98, 47,0 +,131,109, 52,0,131,109, 52,0,139,116, 57,0,139,116, 57,0 +,137,114, 58,0,137,114, 58,0,123, 98, 47,0,123, 98, 47,0 +,125,101, 49,0,125,101, 49,0,139,115, 59,0,139,115, 59,0 +,141,118, 62,0,141,118, 62,0,137,110, 58,0,137,110, 58,0 +,130,106, 52,0,130,106, 52,0,131,108, 55,0,131,108, 55,0 +,107, 58, 20,0,107, 58, 20,0, 80, 50, 27,0, 80, 50, 27,0 +, 77, 51, 30,0, 82, 53, 31,0,158, 96, 50,0,158, 96, 50,0 +,130,104, 57,0,127,100, 53,0,121, 97, 46,0,118, 92, 43,0 +,131,109, 52,0,131,109, 52,0,139,116, 57,0,139,116, 57,0 +,137,114, 58,0,137,114, 58,0,123, 98, 47,0,123, 98, 47,0 +,125,101, 49,0,125,101, 49,0,139,115, 59,0,139,115, 59,0 +,141,118, 62,0,141,118, 62,0,137,110, 58,0,137,110, 58,0 +,130,106, 52,0,130,106, 52,0,131,108, 55,0,131,108, 55,0 +,107, 58, 20,0,107, 58, 20,0, 82, 51, 26,0, 82, 51, 26,0 +, 76, 50, 29,0, 76, 50, 29,0,141, 82, 43,0,144, 81, 38,0 +,255,231, 49,0,255,230, 46,0,255,238, 88,0,255,238, 88,0 +,118, 90, 42,0,118, 90, 42,0,137,114, 58,0,138,111, 58,0 +,120, 93, 46,0,120, 93, 46,0,255,233, 60,0,255,233, 60,0 +,255,238, 88,0,255,238, 88,0,118, 92, 43,0,118, 92, 43,0 +,118, 91, 42,0,118, 91, 42,0,255,235, 73,0,255,235, 73,0 +,100, 73, 31,0,100, 73, 31,0,255,238, 88,0,255,238, 88,0 +, 97, 54, 19,0, 97, 54, 19,0, 83, 49, 23,0, 77, 46, 22,0 +, 72, 46, 26,0, 76, 50, 29,0,144, 81, 38,0,141, 82, 43,0 +,255,230, 46,0,255,230, 46,0,255,238, 88,0,255,238, 87,0 +,118, 90, 42,0,118, 90, 42,0,137,110, 58,0,137,110, 58,0 +,120, 93, 46,0,120, 93, 46,0,255,233, 60,0,255,232, 57,0 +,255,238, 88,0,255,238, 88,0,118, 92, 43,0,118, 92, 43,0 +,118, 91, 42,0,118, 94, 41,0,255,235, 73,0,255,235, 73,0 +,100, 73, 31,0,100, 73, 31,0,255,238, 88,0,255,238, 88,0 +, 97, 54, 19,0, 97, 54, 19,0, 77, 46, 22,0, 81, 47, 23,0 +, 76, 50, 29,0, 76, 50, 29,0,135, 73, 33,0,135, 73, 33,0 +,255,228, 35,0,255,228, 35,0, 82, 56, 21,0, 82, 56, 20,0 +,255,238, 88,0,255,238, 88,0,107, 80, 36,0,107, 80, 36,0 +,255,223, 10,0,255,223, 10,0, 14, 11, 3,0, 14, 11, 3,0 +, 97, 72, 30,0, 97, 72, 30,0,255,238, 87,0,255,238, 87,0 +, 93, 70, 27,0, 93, 70, 27,0,255,221, 2,0,255,221, 2,0 +, 66, 50, 15,0, 67, 52, 16,0,255,238, 88,0,255,238, 88,0 +, 62, 33, 10,0, 62, 32, 8,0, 74, 43, 19,0, 74, 43, 19,0 +, 76, 50, 29,0, 76, 50, 29,0,135, 73, 33,0,135, 73, 33,0 +,255,228, 35,0,255,228, 37,0, 82, 56, 21,0, 82, 56, 20,0 +,255,238, 88,0,255,238, 88,0,104, 80, 30,0,107, 80, 36,0 +,255,224, 13,0,255,224, 13,0, 14, 11, 3,0, 16, 12, 3,0 +,100, 73, 31,0, 97, 72, 30,0,255,238, 87,0,255,238, 88,0 +, 93, 70, 27,0, 93, 70, 27,0,255,221, 2,0,255,221, 2,0 +, 66, 50, 15,0, 67, 52, 16,0,255,238, 88,0,255,238, 88,0 +, 62, 32, 8,0, 62, 32, 8,0, 74, 43, 19,0, 74, 43, 19,0 +, 83, 55, 32,0, 83, 55, 32,0,130, 70, 31,0,130, 70, 31,0 +,255,232, 57,0,255,232, 57,0,255,238, 88,0,255,238, 88,0 +, 43, 34, 8,0, 43, 34, 8,0, 80, 62, 19,0, 82, 64, 20,0 +,255,238, 87,0,255,238, 87,0, 27, 21, 8,0, 27, 21, 8,0 +,109, 84, 35,0,109, 84, 35,0,255,228, 37,0,255,228, 37,0 +, 35, 26, 9,0, 35, 26, 9,0, 82, 64, 22,0, 82, 64, 22,0 +,255,238, 88,0,255,238, 87,0, 49, 39, 13,0, 49, 39, 13,0 +, 68, 31, 2,0, 68, 31, 2,0, 76, 43, 16,0, 76, 43, 16,0 +, 83, 55, 32,0, 83, 55, 32,0,130, 70, 31,0,130, 70, 31,0 +,255,232, 57,0,255,232, 57,0,255,238, 88,0,255,238, 88,0 +, 43, 34, 8,0, 43, 34, 8,0, 82, 64, 20,0, 82, 64, 20,0 +,255,238, 87,0,255,238, 87,0, 27, 21, 8,0, 27, 21, 8,0 +,109, 84, 35,0,109, 84, 35,0,255,228, 37,0,255,228, 37,0 +, 35, 26, 9,0, 35, 26, 9,0, 82, 64, 22,0, 82, 64, 22,0 +,255,238, 87,0,255,238, 87,0, 49, 39, 13,0, 49, 39, 13,0 +, 68, 31, 2,0, 68, 31, 2,0, 76, 43, 16,0, 76, 43, 16,0 +, 72, 46, 26,0, 72, 46, 26,0,133, 69, 30,0,133, 69, 30,0 +,255,238, 88,0,255,238, 87,0, 14, 11, 3,0, 14, 11, 3,0 +,255,238, 89,0,255,238, 89,0, 82, 63, 15,0, 82, 63, 15,0 +,255,238, 89,0,255,238, 88,0, 80, 62, 19,0, 80, 62, 19,0 +, 86, 67, 22,0, 86, 67, 22,0,255,238, 88,0,255,238, 88,0 +, 67, 52, 16,0, 67, 52, 16,0,255,238, 87,0,255,238, 88,0 +, 42, 33, 8,0, 42, 33, 8,0,255,238, 89,0,255,238, 89,0 +, 68, 31, 2,0, 68, 31, 2,0, 68, 36, 11,0, 68, 36, 11,0 +, 72, 46, 26,0, 72, 46, 26,0,133, 69, 30,0,133, 69, 30,0 +,255,238, 87,0,255,238, 87,0, 14, 11, 3,0, 14, 11, 3,0 +,255,238, 89,0,255,238, 89,0, 82, 63, 15,0, 82, 63, 15,0 +,255,238, 88,0,255,238, 88,0, 80, 62, 19,0, 80, 62, 19,0 +, 86, 67, 22,0, 86, 67, 22,0,255,238, 88,0,255,238, 88,0 +, 67, 52, 16,0, 67, 52, 16,0,255,238, 87,0,255,238, 88,0 +, 42, 33, 8,0, 42, 33, 8,0,255,238, 89,0,255,238, 88,0 +, 68, 31, 2,0, 68, 31, 2,0, 68, 36, 11,0, 68, 36, 11,0 +, 75, 48, 27,0, 75, 48, 27,0,138, 77, 35,0,138, 77, 35,0 +,255,238, 88,0,255,238, 88,0,255,238, 88,0,255,238, 88,0 +, 47, 37, 11,0, 47, 37, 11,0,108, 84, 26,0,108, 84, 26,0 +, 95, 76, 27,0, 95, 76, 27,0,255,238, 89,0,255,238, 89,0 +,255,238, 88,0,255,238, 88,0, 71, 55, 20,0, 71, 55, 20,0 +, 98, 77, 26,0, 98, 77, 26,0,255,238, 88,0,255,238, 88,0 +, 78, 62, 19,0, 78, 62, 19,0,255,238, 88,0,255,238, 88,0 +, 31, 15, 2,0, 31, 15, 2,0, 71, 40, 13,0, 71, 40, 13,0 +, 75, 48, 27,0, 75, 48, 27,0,138, 77, 35,0,138, 77, 35,0 +,255,238, 88,0,255,238, 88,0,255,238, 88,0,255,238, 88,0 +, 47, 37, 11,0, 49, 39, 13,0,108, 84, 26,0,108, 84, 26,0 +, 95, 76, 27,0, 95, 76, 27,0,255,238, 89,0,255,238, 89,0 +,255,238, 88,0,255,238, 88,0, 71, 55, 20,0, 71, 55, 20,0 +, 98, 77, 26,0, 98, 77, 26,0,255,238, 88,0,255,238, 88,0 +, 78, 62, 19,0, 78, 62, 19,0,255,238, 88,0,255,238, 88,0 +, 31, 15, 2,0, 31, 15, 2,0, 71, 40, 13,0, 71, 40, 13,0 +, 77, 50, 31,0, 77, 50, 31,0,127, 80, 43,0,127, 80, 43,0 +,118, 64, 25,0,118, 64, 25,0, 93, 47, 10,0, 93, 46, 7,0 +, 53, 24, 1,0, 53, 24, 1,0,122, 58, 6,0,122, 58, 6,0 +,128, 64, 15,0,128, 64, 15,0,117, 58, 15,0,117, 58, 15,0 +, 91, 46, 9,0, 91, 46, 9,0, 91, 46, 9,0, 91, 46, 9,0 +,119, 60, 10,0,119, 60, 10,0,115, 58, 11,0,115, 58, 11,0 +, 96, 43, 1,0, 96, 43, 1,0, 93, 47, 10,0, 93, 47, 10,0 +, 53, 28, 9,0, 54, 30, 10,0, 77, 46, 22,0, 77, 46, 22,0 +, 77, 50, 31,0, 77, 50, 31,0,127, 80, 43,0,127, 80, 43,0 +,118, 64, 25,0,118, 64, 25,0, 93, 46, 7,0, 93, 46, 7,0 +, 53, 24, 1,0, 53, 24, 1,0,122, 58, 6,0,122, 58, 6,0 +,128, 64, 15,0,119, 60, 10,0,117, 58, 15,0,117, 58, 15,0 +, 91, 46, 9,0, 91, 46, 9,0, 91, 46, 9,0, 91, 46, 9,0 +,119, 60, 10,0,119, 60, 10,0,115, 58, 11,0,115, 58, 11,0 +, 96, 43, 1,0, 96, 43, 1,0, 93, 47, 10,0, 93, 47, 10,0 +, 53, 28, 9,0, 53, 28, 9,0, 76, 46, 20,0, 77, 46, 22,0 +, 64, 46, 30,0, 64, 46, 30,0, 76, 49, 27,0, 76, 49, 27,0 +, 67, 41, 20,0, 67, 41, 20,0, 65, 37, 14,0, 68, 39, 16,0 +, 66, 37, 14,0, 66, 37, 14,0, 65, 37, 14,0, 65, 37, 14,0 +, 74, 43, 19,0, 71, 41, 19,0, 68, 39, 16,0, 68, 39, 16,0 +, 68, 39, 16,0, 68, 39, 16,0, 69, 39, 16,0, 69, 39, 16,0 +, 65, 37, 14,0, 65, 37, 14,0, 63, 35, 14,0, 63, 35, 14,0 +, 61, 35, 14,0, 65, 37, 14,0, 61, 35, 14,0, 61, 35, 14,0 +, 71, 41, 19,0, 71, 41, 19,0, 59, 37, 20,0, 59, 37, 20,0 +, 65, 45, 29,0, 64, 46, 30,0, 76, 49, 27,0, 76, 49, 27,0 +, 67, 41, 20,0, 67, 41, 20,0, 69, 39, 16,0, 65, 37, 14,0 +, 66, 37, 14,0, 71, 40, 13,0, 65, 37, 14,0, 65, 37, 14,0 +, 68, 41, 17,0, 68, 41, 17,0, 68, 39, 16,0, 68, 39, 16,0 +, 68, 39, 16,0, 69, 39, 16,0, 69, 39, 16,0, 69, 39, 16,0 +, 65, 37, 14,0, 65, 37, 14,0, 63, 35, 14,0, 65, 37, 14,0 +, 61, 35, 14,0, 62, 33, 10,0, 61, 35, 14,0, 61, 35, 14,0 +, 71, 41, 19,0, 71, 41, 19,0, 59, 37, 20,0, 59, 37, 20,0 +#endif +#ifdef LOGO_2 + 59, 42, 28,0, 87, 60, 38,0, 84, 57, 35,0, 81, 54, 33,0 +, 82, 56, 34,0, 88, 59, 36,0, 88, 59, 36,0, 88, 59, 36,0 +, 86, 58, 36,0, 88, 59, 36,0, 89, 60, 37,0, 89, 60, 37,0 +, 87, 60, 38,0, 89, 60, 37,0, 88, 59, 36,0, 84, 57, 35,0 +, 78, 52, 32,0, 84, 57, 35,0, 89, 60, 37,0, 87, 60, 38,0 +, 84, 57, 35,0, 86, 58, 36,0, 84, 57, 35,0, 82, 56, 34,0 +, 82, 56, 34,0, 82, 56, 34,0, 81, 54, 33,0, 76, 51, 31,0 +, 76, 51, 31,0, 81, 54, 33,0, 86, 58, 36,0, 57, 40, 26,0 +, 89, 60, 37,0,136, 95, 61,0,162,108, 65,0,156,103, 62,0 +,153,101, 61,0,160,106, 64,0,158,105, 64,0,156,103, 62,0 +,164,109, 66,0,164,109, 66,0,164,109, 66,0,154,104, 62,0 +,156,103, 62,0,157,104, 62,0,156,103, 62,0,145, 96, 58,0 +,153,101, 61,0,148, 98, 60,0,153,101, 61,0,153,101, 61,0 +,162,108, 65,0,162,108, 65,0,156,103, 62,0,154,104, 62,0 +,156,103, 62,0,162,108, 65,0,148, 98, 60,0,143, 96, 58,0 +,145, 96, 58,0,156,103, 62,0,152,104, 66,0, 87, 60, 38,0 +, 73, 49, 32,0,146, 97, 60,0,148,103, 66,0,167,111, 68,0 +,158,105, 64,0,157,104, 62,0,154,103, 64,0,143, 96, 58,0 +,143, 96, 58,0,143, 96, 58,0,146, 97, 60,0,143, 96, 58,0 +,137, 90, 53,0,148, 97, 57,0,148, 97, 57,0,139, 92, 53,0 +,139, 92, 53,0,138, 92, 56,0,148, 97, 57,0,153,101, 61,0 +,148, 98, 60,0,141, 94, 57,0,141, 94, 57,0,131, 88, 53,0 +,144, 94, 57,0,143, 96, 58,0,150,100, 61,0,148, 98, 60,0 +,154,104, 62,0,142, 97, 62,0,164,109, 66,0, 78, 52, 32,0 +, 70, 48, 29,0,135, 90, 56,0,169,112, 68,0,135, 92, 60,0 +,132, 96, 62,0,130, 97, 62,0,137,101, 66,0,144,106, 69,0 +,140,104, 68,0,138,104, 70,0,137,102, 68,0,140,104, 68,0 +,130, 93, 56,0,223,192, 81,0,237,207, 88,0,237,207, 88,0 +,236,206, 86,0,237,207, 88,0,237,207, 88,0,137,101, 66,0 +,144,106, 69,0,137,102, 68,0,133,101, 66,0,133,101, 66,0 +,137,102, 68,0,130, 97, 62,0,121, 90, 57,0,124, 90, 58,0 +,123, 86, 55,0,162,108, 65,0,156,103, 62,0, 76, 51, 31,0 +, 73, 49, 30,0,146, 97, 60,0,160,106, 64,0,117, 88, 56,0 +,130,112, 74,0,130,112, 74,0,130,112, 74,0,154,135, 91,0 +,166,148,101,0,166,148,101,0,168,149,102,0,166,148, 99,0 +,147,124, 77,0,132,107, 61,0,215,184, 75,0,234,205, 88,0 +,156,136, 86,0,150,129, 80,0,234,205, 85,0,236,206, 86,0 +,164,145, 98,0,164,145, 98,0,165,146,100,0,166,148,101,0 +,154,135, 91,0,130,112, 74,0,133,114, 76,0,133,114, 76,0 +,110, 85, 54,0,153,101, 61,0,164,109, 66,0, 78, 52, 32,0 +, 70, 48, 29,0,158,105, 64,0,162,108, 65,0,124, 90, 58,0 +,129,110, 73,0,130,113, 76,0,130,113, 76,0,129,110, 73,0 +,148,129, 86,0,164,145, 98,0,166,148, 99,0,166,148, 99,0 +,161,142, 93,0,132,107, 61,0,212,178, 73,0,239,210, 92,0 +,156,135, 82,0,153,130, 79,0,236,206, 86,0,238,209, 89,0 +,162,144, 95,0,168,149,102,0,168,149,102,0,150,132, 89,0 +,127,109, 72,0,129,110, 73,0,130,112, 74,0,130,112, 74,0 +,112, 86, 55,0,153,101, 61,0,175,116, 70,0, 73, 49, 30,0 +, 73, 49, 30,0,146, 97, 60,0,167,112, 66,0,137,101, 66,0 +,129,110, 73,0,130,112, 74,0,133,114, 76,0,133,114, 76,0 +,130,112, 74,0,149,131, 88,0,166,148, 99,0,162,144, 95,0 +,157,138, 89,0,132,107, 61,0,208,175, 70,0,234,205, 88,0 +,234,205, 88,0,224,193, 81,0,232,203, 84,0,159,140, 90,0 +,162,144, 97,0,166,148, 99,0,150,132, 89,0,130,112, 74,0 +,133,114, 76,0,132,112, 74,0,130,112, 74,0,130,112, 74,0 +,123, 96, 63,0,150,100, 61,0,160,106, 64,0, 76, 51, 31,0 +, 75, 52, 33,0,141, 94, 57,0,169,113, 67,0,144,106, 69,0 +,161,142, 96,0,129,110, 73,0,129,110, 73,0,132,112, 74,0 +,132,112, 74,0,127,109, 72,0,150,132, 89,0,164,145, 98,0 +,161,142, 93,0,135,112, 63,0,215,184, 75,0,239,210, 92,0 +,156,135, 82,0,144,122, 72,0,232,203, 84,0,237,207, 88,0 +,162,144, 95,0,148,129, 86,0,127,109, 72,0,132,112, 74,0 +,132,112, 74,0,130,112, 74,0,130,112, 74,0,164,145, 98,0 +,127,100, 66,0,150,100, 61,0,156,103, 62,0, 81, 54, 33,0 +, 78, 52, 32,0,144, 94, 57,0,169,113, 67,0,149,109, 69,0 +,166,148,101,0,161,142, 96,0,129,110, 73,0,127,109, 72,0 +,130,112, 74,0,130,112, 74,0,129,110, 73,0,146,128, 84,0 +,153,134, 84,0,137,113, 65,0,217,185, 74,0,236,206, 86,0 +,156,135, 82,0,148,128, 75,0,227,197, 82,0,236,206, 86,0 +,148,129, 86,0,130,112, 74,0,130,112, 74,0,129,110, 73,0 +,127,109, 72,0,127,109, 72,0,161,142, 96,0,168,149,102,0 +,129,100, 68,0,148, 98, 60,0,157,104, 62,0, 82, 56, 34,0 +, 81, 54, 33,0,143, 96, 58,0,173,115, 69,0,149,109, 69,0 +,165,146,100,0,166,148,101,0,161,142, 96,0,130,112, 74,0 +,130,112, 74,0,136,115, 77,0,136,115, 77,0,130,109, 70,0 +,129,106, 61,0,202,166, 65,0,204,170, 69,0,222,190, 80,0 +,227,197, 82,0,217,185, 76,0,217,185, 74,0,140,120, 76,0 +,130,112, 74,0,134,116, 77,0,133,114, 76,0,129,110, 73,0 +,133,114, 76,0,162,144, 97,0,168,149,102,0,166,148,101,0 +,130,100, 65,0,148, 98, 60,0,160,106, 64,0, 82, 56, 34,0 +, 73, 49, 30,0,146, 97, 60,0,167,111, 68,0,149,110, 72,0 +,169,150,104,0,169,150,104,0,165,146,100,0,164,145, 98,0 +,134,116, 77,0,133,114, 76,0,133,114, 76,0,130,109, 70,0 +,115, 94, 55,0,117, 93, 53,0,137,113, 65,0,144,122, 72,0 +,146,124, 75,0,148,126, 78,0,136,117, 73,0,129,110, 73,0 +,134,116, 77,0,134,116, 77,0,132,112, 74,0,134,116, 77,0 +,164,145, 98,0,168,149,102,0,169,150,104,0,166,148,101,0 +,127,100, 66,0,148, 98, 60,0,167,111, 68,0, 82, 56, 34,0 +, 73, 49, 30,0,144, 94, 57,0,161,106, 62,0,153,110, 70,0 +,164,145, 98,0,164,145, 98,0,165,146,100,0,165,146,100,0 +,161,142, 96,0,134,116, 77,0,129,110, 73,0,132,112, 74,0 +,130,109, 70,0,117, 97, 59,0,136,117, 73,0,157,138, 89,0 +,156,136, 86,0,136,117, 73,0,125,106, 68,0,133,114, 76,0 +,136,115, 77,0,130,112, 74,0,134,116, 77,0,164,145, 98,0 +,166,148, 99,0,166,148,101,0,166,148,101,0,165,146,100,0 +,133,101, 66,0,146, 97, 60,0,157,104, 62,0, 81, 54, 33,0 +, 73, 49, 30,0,141, 93, 54,0,158,100, 55,0,227,197, 82,0 +,240,212, 94,0,240,212, 94,0,240,210, 92,0,238,209, 89,0 +,158,140, 93,0,162,144, 95,0,130,113, 76,0,126,108, 70,0 +,125,105, 65,0,125,105, 65,0,239,210, 92,0,240,210, 90,0 +,238,209, 89,0,240,210, 90,0,237,208, 86,0,132,112, 74,0 +,130,112, 74,0,135,117, 80,0,161,142, 93,0,161,142, 93,0 +,240,210, 92,0,240,210, 90,0,240,210, 90,0,240,210, 90,0 +,126, 98, 64,0,143, 96, 58,0,153,101, 61,0, 81, 54, 33,0 +, 69, 46, 28,0,141, 93, 54,0,152, 93, 47,0,110, 72, 38,0 +,215,184, 75,0,236,206, 86,0,157,138, 89,0,231,202, 85,0 +,237,207, 88,0,166,148,101,0,165,146,100,0,133,116, 75,0 +,114, 93, 56,0,222,190, 80,0,236,206, 86,0,122,100, 59,0 +,113, 88, 53,0,109, 87, 48,0,234,205, 88,0,237,207, 88,0 +,135,117, 80,0,162,144, 95,0,148,126, 78,0,217,185, 74,0 +,236,206, 86,0,152,130, 81,0,156,136, 86,0,232,203, 84,0 +,236,206, 86,0,148, 98, 60,0,154,104, 62,0, 78, 52, 32,0 +, 73, 49, 30,0,136, 88, 50,0,151, 94, 49,0,113, 70, 33,0 +,205,173, 66,0,232,204, 82,0,153,133, 79,0,140,117, 70,0 +,231,202, 85,0,236,206, 86,0,166,148, 99,0,162,144, 95,0 +,109, 88, 49,0,212,178, 73,0,232,203, 84,0,125,103, 62,0 +,121, 99, 57,0, 97, 75, 37,0,214,182, 73,0,234,205, 85,0 +,158,140, 93,0,157,138, 89,0,135,112, 63,0,195,160, 60,0 +,221,189, 77,0,232,204, 82,0,154,133, 81,0,159,140, 90,0 +,126, 96, 61,0,125, 84, 50,0,169,112, 68,0, 78, 52, 32,0 +, 76, 51, 31,0,136, 88, 50,0,158, 98, 51,0,113, 70, 33,0 +,214,182, 73,0,237,207, 88,0,148,128, 75,0,140,117, 70,0 +,223,192, 81,0,238,209, 89,0,164,145, 95,0,160,140, 90,0 +,129,106, 61,0,215,184, 75,0,239,210, 92,0,125,105, 65,0 +,125,103, 62,0, 99, 77, 40,0,214,182, 73,0,238,209, 89,0 +,161,142, 93,0,155,136, 86,0,133,109, 62,0,123, 98, 52,0 +,209,176, 70,0,232,203, 84,0,237,208, 86,0,157,138, 89,0 +,123, 95, 59,0,131, 88, 53,0,153,101, 61,0, 82, 56, 34,0 +, 75, 52, 33,0,130, 85, 49,0,161,101, 54,0,115, 72, 34,0 +,217,185, 74,0,234,205, 85,0,150,129, 76,0,144,121, 71,0 +,224,194, 77,0,232,204, 82,0,155,136, 86,0,156,136, 86,0 +,102, 80, 41,0,205,173, 66,0,234,205, 85,0,130,109, 70,0 +,125,105, 65,0,106, 84, 45,0,217,185, 74,0,234,205, 85,0 +,162,144, 95,0,164,145, 95,0,150,129, 80,0,144,121, 71,0 +,144,121, 71,0,141,120, 69,0,230,200, 81,0,234,205, 85,0 +,234,205, 85,0,133, 89, 53,0,153,101, 61,0, 82, 56, 34,0 +, 73, 49, 30,0,132, 84, 49,0,154, 93, 48,0,115, 73, 36,0 +,222,190, 80,0,237,208, 86,0,153,133, 79,0,238,209, 89,0 +,236,206, 86,0,157,138, 89,0,157,138, 89,0,125,105, 65,0 +, 97, 75, 40,0,202,166, 65,0,237,208, 86,0,121,101, 60,0 +,121,101, 60,0,112, 91, 49,0,228,197, 84,0,240,210, 90,0 +,134,116, 77,0,164,145, 98,0,152,130, 81,0,223,192, 81,0 +,238,209, 89,0,150,129, 76,0,144,121, 71,0,234,205, 85,0 +,238,209, 89,0,137, 90, 53,0,160,106, 64,0, 82, 56, 34,0 +, 69, 46, 28,0,139, 92, 53,0,147, 87, 44,0,202,169, 70,0 +,205,172, 72,0,219,189, 82,0,222,190, 80,0,221,189, 77,0 +,153,134, 84,0,161,142, 93,0,130,113, 76,0,125,105, 65,0 +,109, 87, 48,0,101, 77, 41,0,212,178, 73,0,230,200, 81,0 +,230,200, 81,0,217,185, 74,0,220,187, 77,0,125,105, 65,0 +,127,109, 72,0,130,112, 74,0,147,124, 77,0,137,113, 65,0 +,214,182, 73,0,221,189, 77,0,214,182, 73,0,217,185, 76,0 +,113, 88, 53,0,156,103, 62,0,150,100, 61,0, 78, 52, 32,0 +, 69, 46, 28,0,139, 92, 53,0,140, 86, 45,0,117, 76, 39,0 +,135,112, 63,0,137,113, 65,0,142,118, 72,0,152,130, 81,0 +,159,140, 90,0,134,116, 77,0,132,112, 74,0,132,112, 74,0 +,125,105, 65,0,107, 86, 49,0,122,100, 59,0,144,122, 72,0 +,142,120, 73,0,122,100, 59,0,117, 97, 59,0,130,109, 70,0 +,132,112, 74,0,126,108, 70,0,125,105, 65,0,134,112, 65,0 +,134,112, 65,0,137,113, 65,0,142,118, 72,0,150,129, 80,0 +,121, 90, 57,0,138, 92, 56,0,158,105, 64,0, 78, 52, 32,0 +, 69, 46, 28,0,137, 90, 53,0,155,101, 57,0,145,102, 62,0 +,160,140, 90,0,162,144, 95,0,164,145, 98,0,162,144, 95,0 +,133,114, 76,0,132,112, 74,0,133,114, 76,0,132,112, 74,0 +,125,106, 68,0,140,120, 76,0,159,140, 90,0,157,138, 89,0 +,160,140, 90,0,156,136, 86,0,143,124, 80,0,130,109, 70,0 +,133,114, 76,0,132,112, 74,0,126,108, 70,0,125,106, 68,0 +,153,134, 84,0,155,136, 86,0,159,140, 90,0,158,140, 93,0 +,130,100, 65,0,145, 96, 58,0,158,105, 64,0, 76, 51, 31,0 +, 73, 49, 30,0,130, 87, 52,0,167,109, 63,0,143,105, 67,0 +,164,145, 98,0,166,148,101,0,164,145, 98,0,130,113, 76,0 +,130,112, 74,0,136,115, 77,0,136,115, 77,0,130,112, 74,0 +,137,116, 77,0,236,206, 86,0,236,206, 86,0,161,142, 93,0 +,161,142, 93,0,155,136, 86,0,236,206, 86,0,236,206, 86,0 +,130,112, 74,0,133,114, 76,0,133,114, 76,0,125,106, 68,0 +,126,108, 70,0,157,138, 89,0,161,142, 93,0,166,148,101,0 +,129,100, 68,0,143, 96, 58,0,154,104, 62,0, 77, 52, 31,0 +, 81, 54, 33,0,131, 88, 53,0,154,104, 62,0,146,108, 70,0 +,166,148,101,0,164,145, 98,0,130,113, 76,0,130,112, 74,0 +,132,112, 74,0,132,112, 74,0,129,110, 73,0,145,125, 81,0 +,139,116, 69,0,212,178, 73,0,240,212, 94,0,164,145, 95,0 +,162,144, 95,0,157,138, 89,0,239,210, 92,0,240,210, 90,0 +,147,127, 86,0,130,112, 74,0,132,112, 74,0,130,112, 74,0 +,129,110, 73,0,129,110, 73,0,158,140, 93,0,162,144, 97,0 +,127,100, 66,0,133, 89, 53,0,156,103, 62,0, 78, 52, 32,0 +, 78, 52, 32,0,141, 94, 57,0,162,108, 65,0,152,111, 72,0 +,162,144, 97,0,129,110, 73,0,129,110, 73,0,129,110, 73,0 +,129,110, 73,0,126,108, 70,0,148,129, 86,0,162,144, 95,0 +,140,117, 70,0,129,105, 58,0,217,185, 74,0,236,206, 86,0 +,156,136, 86,0,234,205, 85,0,237,207, 88,0,162,144, 95,0 +,165,146,100,0,149,131, 88,0,127,109, 72,0,130,112, 74,0 +,129,110, 73,0,129,110, 73,0,127,109, 72,0,158,140, 93,0 +,126, 98, 64,0,146, 97, 60,0,153,101, 61,0, 81, 54, 33,0 +, 73, 49, 32,0,138, 92, 56,0,164,109, 66,0,140,104, 68,0 +,130,112, 74,0,129,110, 73,0,129,110, 73,0,129,110, 73,0 +,127,109, 72,0,146,128, 84,0,161,142, 96,0,159,140, 90,0 +,155,136, 86,0,137,113, 65,0,133,109, 62,0,224,194, 77,0 +,236,206, 86,0,236,206, 86,0,160,139, 90,0,164,145, 95,0 +,165,146,100,0,166,148,101,0,150,132, 89,0,130,113, 76,0 +,134,116, 77,0,133,114, 76,0,130,113, 76,0,130,113, 76,0 +,122, 95, 61,0,143, 96, 58,0,148, 98, 60,0, 78, 52, 32,0 +, 69, 46, 28,0,135, 90, 56,0,164,109, 66,0,117, 88, 56,0 +,129,110, 73,0,129,110, 73,0,129,110, 73,0,129,110, 73,0 +,149,131, 88,0,164,145, 98,0,164,145, 98,0,161,142, 93,0 +,157,138, 89,0,146,124, 75,0,137,113, 65,0,220,187, 77,0 +,227,197, 82,0,238,209, 89,0,160,140, 90,0,165,146,100,0 +,166,148,101,0,166,148,101,0,164,145, 98,0,150,132, 89,0 +,129,110, 73,0,130,112, 74,0,130,112, 74,0,129,110, 73,0 +,102, 81, 53,0,143, 96, 58,0,150,100, 61,0, 73, 49, 30,0 +, 69, 46, 28,0,146, 97, 60,0,162,108, 65,0,124, 90, 58,0 +,133,114, 76,0,130,112, 74,0,127,109, 72,0,148,129, 86,0 +,162,144, 97,0,165,146,100,0,166,148, 99,0,161,142, 93,0 +,153,134, 84,0,146,124, 75,0,230,200, 81,0,224,194, 77,0 +,133,109, 62,0,217,185, 74,0,234,205, 85,0,162,144, 95,0 +,162,144, 95,0,165,146,100,0,165,146,100,0,165,146,100,0 +,154,137, 93,0,130,112, 74,0,130,112, 74,0,129,110, 73,0 +,110, 85, 54,0,148, 98, 60,0,169,112, 68,0, 70, 48, 29,0 +, 70, 48, 29,0,138, 92, 56,0,162,108, 65,0,121, 90, 57,0 +,130,112, 74,0,129,110, 73,0,150,132, 89,0,162,144, 95,0 +,162,144, 97,0,161,142, 96,0,158,140, 93,0,157,138, 89,0 +,141,120, 69,0,220,187, 77,0,237,208, 86,0,148,128, 75,0 +,135,112, 63,0,129,105, 58,0,230,200, 81,0,238,209, 89,0 +,162,144, 97,0,165,146,100,0,168,149,102,0,169,150,104,0 +,166,148,101,0,150,132, 89,0,129,110, 73,0,130,112, 74,0 +,112, 86, 55,0,150,100, 61,0,164,109, 66,0, 76, 51, 31,0 +, 70, 48, 29,0,135, 90, 56,0,164,109, 66,0,131, 90, 57,0 +,132, 96, 62,0,149,109, 69,0,157,116, 73,0,154,114, 74,0 +,149,110, 72,0,152,111, 72,0,149,109, 69,0,150,109, 66,0 +,125, 82, 44,0,202,168, 67,0,224,193, 81,0,150,107, 61,0 +,150,106, 59,0,117, 76, 39,0,204,170, 67,0,232,203, 84,0 +,152,111, 72,0,152,111, 72,0,149,110, 72,0,149,110, 72,0 +,154,114, 74,0,153,110, 70,0,146,108, 70,0,126, 92, 60,0 +,124, 90, 58,0,167,111, 68,0,157,104, 62,0, 76, 51, 31,0 +, 73, 49, 32,0,141, 94, 57,0,142, 97, 62,0,154,103, 64,0 +,148, 98, 60,0,158,105, 64,0,148, 98, 60,0,141, 94, 57,0 +,141, 94, 57,0,141, 94, 57,0,144, 94, 57,0,147, 94, 54,0 +,128, 76, 37,0,128, 76, 37,0,140, 86, 45,0,147, 94, 54,0 +,129, 81, 45,0,128, 76, 37,0,123, 76, 37,0,129, 81, 45,0 +,153,101, 61,0,145, 96, 58,0,150,100, 61,0,150,100, 61,0 +,141, 94, 57,0,138, 92, 56,0,145, 96, 58,0,143, 96, 58,0 +,150,100, 61,0,142, 97, 62,0,167,111, 68,0, 81, 54, 33,0 +, 87, 60, 38,0,115, 78, 49,0,135, 90, 56,0,127, 84, 52,0 +,119, 80, 49,0,121, 81, 49,0,115, 78, 49,0,115, 78, 49,0 +,124, 82, 50,0,121, 81, 49,0,125, 84, 50,0,136, 88, 50,0 +,121, 78, 45,0,115, 75, 44,0,121, 78, 45,0,115, 75, 44,0 +,115, 75, 44,0,115, 75, 44,0,115, 75, 44,0,121, 78, 45,0 +,124, 82, 50,0,125, 84, 50,0,121, 81, 49,0,124, 82, 50,0 +,119, 80, 49,0,119, 80, 49,0,115, 78, 49,0,115, 78, 49,0 +,121, 81, 49,0,133, 89, 53,0,135, 92, 60,0, 88, 59, 36,0 +, 61, 43, 29,0, 87, 60, 38,0, 73, 49, 30,0, 69, 46, 28,0 +, 69, 46, 28,0, 70, 48, 29,0, 70, 48, 29,0, 70, 48, 29,0 +, 70, 48, 29,0, 70, 48, 29,0, 73, 49, 30,0, 69, 46, 28,0 +, 70, 48, 29,0, 73, 49, 30,0, 69, 46, 28,0, 69, 46, 28,0 +, 69, 45, 26,0, 69, 45, 26,0, 73, 49, 30,0, 70, 48, 29,0 +, 69, 46, 28,0, 73, 49, 30,0, 69, 46, 28,0, 69, 46, 28,0 +, 69, 46, 28,0, 69, 46, 28,0, 69, 46, 28,0, 65, 44, 28,0 +, 65, 44, 28,0, 73, 49, 30,0, 86, 58, 36,0, 60, 42, 27,0 +#endif diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index e05fa274..328f916e 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: sdlmain.cpp,v 1.98 2006-01-31 09:26:44 qbix79 Exp $ */ +/* $Id: sdlmain.cpp,v 1.99 2006-02-09 08:42:42 qbix79 Exp $ */ #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -868,11 +868,24 @@ static void SetPriority(PRIORITY_LEVELS level) { } } +static unsigned char logo[32*32*4]= { +#include "dosbox_logo.h" +}; + static void GUI_StartUp(Section * sec) { sec->AddDestroyFunction(&GUI_ShutDown); Section_prop * section=static_cast(sec); sdl.active=false; sdl.updating=false; + + /* Set Icon (must be done before any sdl_setvideomode call) */ +#if WORDS_BIGENDIAN + SDL_Surface* logos= SDL_CreateRGBSurfaceFrom((void*)logo,32,32,32,128,0xff000000,0x00ff0000,0x0000ff00,0); +#else + SDL_Surface* logos= SDL_CreateRGBSurfaceFrom((void*)logo,32,32,32,128,0x000000ff,0x0000ff00,0x00ff0000,0); +#endif + SDL_WM_SetIcon(logos,NULL); + sdl.desktop.fullscreen=section->Get_bool("fullscreen"); sdl.wait_on_error=section->Get_bool("waitonerror"); const char * priority=section->Get_string("priority");