Browse Source

😤

sisyphus
Dustin Falgout 8 years ago
parent
commit
4805ce2b5b
  1. 0
      data/greeter-style.css
  2. 0
      data/greeter-style.gresource.xml
  3. 2
      meson.build
  4. 201
      src/greeter-style-css.c
  5. 7
      src/greeter-style-css.h
  6. 3
      src/lightdm-webkit2-greeter.c
  7. 37
      src/meson.build

0
src/greeter-syle.css → data/greeter-style.css

0
src/greeter.gresource.xml → data/greeter-style.gresource.xml

2
meson.build

@ -47,6 +47,8 @@ conf.set('AS_MICRO_VERSION', as_micro_version)
conf.set('GETTEXT_PACKAGE', '"lightdm-webkit2-greeter"')
conf.set('LOCALE_DIR', '"@0@/@1@"'.format(get_option('datadir'), 'locale'))
conf.set('THEME_DIR', '"@0@"'.format(get_option('with-theme-dir')))
conf.set('CONFIG_DIR', '"@0@"'.format(get_option('with-config-dir')))

201
src/greeter-style-css.c

@ -0,0 +1,201 @@
#include <gio/gio.h>
#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
# define SECTION __attribute__ ((section (".gresource.greeter_css"), aligned (8)))
#else
# define SECTION
#endif
static const SECTION union { const guint8 data[312]; const double alignment; void * const ptr;} greeter_css_resource_data = { {
0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x8f, 0xe2, 0x42, 0x0f,
0x02, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00,
0x11, 0x00, 0x76, 0x00, 0xc0, 0x00, 0x00, 0x00,
0xfc, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00,
0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00,
0x01, 0x00, 0x4c, 0x00, 0x00, 0x01, 0x00, 0x00,
0x04, 0x01, 0x00, 0x00, 0x0c, 0xa6, 0xd8, 0x48,
0x04, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00,
0x18, 0x00, 0x4c, 0x00, 0x1c, 0x01, 0x00, 0x00,
0x20, 0x01, 0x00, 0x00, 0xc2, 0xaf, 0x89, 0x0b,
0x01, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00,
0x04, 0x00, 0x4c, 0x00, 0x24, 0x01, 0x00, 0x00,
0x28, 0x01, 0x00, 0x00, 0xb4, 0xae, 0x96, 0xdb,
0x03, 0x00, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00,
0x09, 0x00, 0x4c, 0x00, 0x34, 0x01, 0x00, 0x00,
0x38, 0x01, 0x00, 0x00, 0x67, 0x72, 0x65, 0x65,
0x74, 0x65, 0x72, 0x2d, 0x73, 0x74, 0x79, 0x6c,
0x65, 0x2e, 0x63, 0x73, 0x73, 0x00, 0x00, 0x00,
0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2c, 0x0a,
0x47, 0x74, 0x6b, 0x57, 0x69, 0x6e, 0x64, 0x6f,
0x77, 0x20, 0x7b, 0x0a, 0x09, 0x62, 0x61, 0x63,
0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3a,
0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
0x3b, 0x0a, 0x7d, 0x0a, 0x00, 0x00, 0x28, 0x75,
0x75, 0x61, 0x79, 0x29, 0x2f, 0x00, 0x00, 0x00,
0x03, 0x00, 0x00, 0x00, 0x6c, 0x69, 0x67, 0x68,
0x74, 0x64, 0x6d, 0x2d, 0x77, 0x65, 0x62, 0x6b,
0x69, 0x74, 0x32, 0x2d, 0x67, 0x72, 0x65, 0x65,
0x74, 0x65, 0x72, 0x2f, 0x00, 0x00, 0x00, 0x00,
0x63, 0x6f, 0x6d, 0x2f, 0x04, 0x00, 0x00, 0x00,
0x61, 0x6e, 0x74, 0x65, 0x72, 0x67, 0x6f, 0x73,
0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
} };
static GStaticResource static_resource = { greeter_css_resource_data.data, sizeof (greeter_css_resource_data.data), NULL, NULL, NULL };
extern GResource *greeter_css_get_resource (void);
GResource *greeter_css_get_resource (void)
{
return g_static_resource_get_resource (&static_resource);
}
/*
If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
destructors, in a sane way, including e.g. on library unload. If not you're on
your own.
Some compilers need #pragma to handle this, which does not work with macros,
so the way you need to use this is (for constructors):
#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
#endif
G_DEFINE_CONSTRUCTOR(my_constructor)
static void my_constructor(void) {
...
}
*/
#ifndef __GTK_DOC_IGNORE__
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
#define G_HAS_CONSTRUCTORS 1
#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
/* Visual studio 2008 and later has _Pragma */
#define G_HAS_CONSTRUCTORS 1
/* We do some weird things to avoid the constructors being optimized
* away on VS2015 if WholeProgramOptimization is enabled. First we
* make a reference to the array from the wrapper to make sure its
* references. Then we use a pragma to make sure the wrapper function
* symbol is always included at the link stage. Also, the symbols
* need to be extern (but not dllexport), even though they are not
* really used from another object file.
*/
/* We need to account for differences between the mangling of symbols
* for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
* with an underscore but symbols on x64 are not.
*/
#ifdef _WIN64
#define G_MSVC_SYMBOL_PREFIX ""
#else
#define G_MSVC_SYMBOL_PREFIX "_"
#endif
#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX)
#define G_MSVC_CTOR(_func,_sym_prefix) \
static void _func(void); \
extern int (* _array ## _func)(void); \
int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \
__pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \
__pragma(section(".CRT$XCU",read)) \
__declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper;
#define G_MSVC_DTOR(_func,_sym_prefix) \
static void _func(void); \
extern int (* _array ## _func)(void); \
int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \
__pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \
__pragma(section(".CRT$XCU",read)) \
__declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor;
#elif defined (_MSC_VER)
#define G_HAS_CONSTRUCTORS 1
/* Pre Visual studio 2008 must use #pragma section */
#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
section(".CRT$XCU",read)
#define G_DEFINE_CONSTRUCTOR(_func) \
static void _func(void); \
static int _func ## _wrapper(void) { _func(); return 0; } \
__declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
section(".CRT$XCU",read)
#define G_DEFINE_DESTRUCTOR(_func) \
static void _func(void); \
static int _func ## _constructor(void) { atexit (_func); return 0; } \
__declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
#elif defined(__SUNPRO_C)
/* This is not tested, but i believe it should work, based on:
* http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
*/
#define G_HAS_CONSTRUCTORS 1
#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
init(_func)
#define G_DEFINE_CONSTRUCTOR(_func) \
static void _func(void);
#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
fini(_func)
#define G_DEFINE_DESTRUCTOR(_func) \
static void _func(void);
#else
/* constructors not supported for this compiler */
#endif
#endif /* __GTK_DOC_IGNORE__ */
#ifdef G_HAS_CONSTRUCTORS
#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor)
#endif
G_DEFINE_CONSTRUCTOR(resource_constructor)
#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor)
#endif
G_DEFINE_DESTRUCTOR(resource_destructor)
#else
#warning "Constructor not supported on this compiler, linking in resources will not work"
#endif
static void resource_constructor (void)
{
g_static_resource_init (&static_resource);
}
static void resource_destructor (void)
{
g_static_resource_fini (&static_resource);
}

7
src/greeter-style-css.h

@ -0,0 +1,7 @@
#ifndef __RESOURCE_greeter_css_H__
#define __RESOURCE_greeter_css_H__
#include <gio/gio.h>
extern GResource *greeter_css_get_resource (void);
#endif

3
src/lightdm-webkit2-greeter.c

@ -48,7 +48,7 @@
#include <config.h>
#include "greeter-css.h"
#include "greeter-style-css.h"
static GtkWidget *web_view;
static GtkWidget *window;
@ -283,7 +283,6 @@ main(int argc, char **argv) {
mlockall (MCL_CURRENT | MCL_FUTURE);
/* Initialize i18n */
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);

37
src/meson.build

@ -1,4 +1,3 @@
pkgg = import('pkgconfig')
gnome = import('gnome')
configure_file(output: 'config.h', configuration: conf)
@ -11,46 +10,32 @@ webext_sources = ['lightdm-webkit2-greeter-ext.c']
webext_incdir = include_directories('.')
webext_cargs = [
'-DVERSION=@0@'.format(as_version),
'-DLOCALE_DIR=@0@'.format(get_option('localedir'))
]
webext = shared_library(
'lightdm-webkit2-greeter-webext',
webext_sources,
dependencies: webext_deps,
c_args: webext_cargs,
include_directories : webext_incdir,
install: true)
pkgg.generate(
version : as_version,
libraries : webext,
name : 'lightdm-webkit2-greeter-webext',
description : 'WebKit web extension that allows the greeter to execute code inside the web process.',
filebase : 'lightdm-webkit2-greeter',
subddirs : 'lightdm-webkit2-greeter')
# ===================================== #
# ------->>> LightDM Greeter <<<------- #
# ===================================== #
# ============================= #
# ------->>> Greeter <<<------- #
# ============================= #
greeter_css = gnome.compile_resources('greeter-css', 'greeter.gresource.xml', c_name : 'greeter_css')
greeter_headers = ['greeter-style-css.h']
greeter_sources = ['greeter-style-css.c', 'lightdm-webkit2-greeter.c']
greeter_sources = ['lightdm-webkit2-greeter.c', greeter_css]
extdir = '@0@/@1@'.format(get_option('libdir'), 'lightdm-webkit2-greeter')
extdir = '"@0@/@1@"'.format(get_option('libdir'), 'lightdm-webkit2-greeter')
greeter_cargs = [
'-DLIGHTDM_WEBKIT2_GREETER_EXTENSIONS_DIR=@0@'.format(extdir),
'-DVERSION=@0@'.format(as_version),
'-DLOCALE_DIR=@0@'.format(get_option('localedir'))
'-DLIGHTDM_WEBKIT2_GREETER_EXTENSIONS_DIR=@0@'.format(extdir)
]
install_headers(greeter_headers, subdir : 'lightdm-webkit2-greeter')
greeter = executable(
'lightdm-webkit2-greeter',
greeter_sources,
dependencies: deps,
c_args: greeter_cargs)
c_args: greeter_cargs,
install: true)

Loading…
Cancel
Save