tint2conf: Speed up load
This commit is contained in:
o9000
parent
6931a37e95
commit
de982b9ada
6 changed files with 310 additions and 28 deletions
|
|
@ -26,6 +26,7 @@ set(SOURCES ../util/common.c
|
|||
../server.c
|
||||
../launcher/apps-common.c
|
||||
../launcher/icon-theme-common.c
|
||||
md4.c
|
||||
main.c
|
||||
properties.c
|
||||
properties_rw.c
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ int main(int argc, char **argv)
|
|||
{
|
||||
gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
|
||||
if (!g_file_test(tint2_config_dir, G_FILE_TEST_IS_DIR))
|
||||
g_mkdir(tint2_config_dir, 0777);
|
||||
g_mkdir(tint2_config_dir, 0700);
|
||||
g_free(tint2_config_dir);
|
||||
}
|
||||
|
||||
|
|
|
|||
274
src/tint2conf/md4.c
Normal file
274
src/tint2conf/md4.c
Normal file
|
|
@ -0,0 +1,274 @@
|
|||
/*
|
||||
* Cryptographic API.
|
||||
*
|
||||
* MD4 Message Digest Algorithm (RFC1320).
|
||||
*
|
||||
* Implementation derived from Andrew Tridgell and Steve French's
|
||||
* CIFS MD4 implementation, and the cryptoapi implementation
|
||||
* originally based on the public domain implementation written
|
||||
* by Colin Plumb in 1993.
|
||||
*
|
||||
* Copyright (c) Andrew Tridgell 1997-1998.
|
||||
* Modified by Steve French (sfrench@us.ibm.com) 2002
|
||||
* Copyright (c) Cryptoapi developers.
|
||||
* Copyright (c) 2002 David S. Miller (davem@redhat.com)
|
||||
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
typedef u_int8_t u8;
|
||||
typedef u_int32_t u32;
|
||||
typedef u_int64_t u64;
|
||||
|
||||
#ifndef ARRAY_SIZE
|
||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
||||
#endif
|
||||
|
||||
#define shash_desc md4_ctx
|
||||
#define shash_desc_ctx(x) (x)
|
||||
|
||||
#define MD4_DIGEST_SIZE 16
|
||||
#define MD4_HMAC_BLOCK_SIZE 64
|
||||
#define MD4_BLOCK_WORDS 16
|
||||
#define MD4_HASH_WORDS 4
|
||||
|
||||
struct md4_ctx {
|
||||
u32 hash[MD4_HASH_WORDS];
|
||||
u32 block[MD4_BLOCK_WORDS];
|
||||
u64 byte_count;
|
||||
};
|
||||
|
||||
static inline u32 lshift(u32 x, unsigned int s)
|
||||
{
|
||||
x &= 0xFFFFFFFF;
|
||||
return ((x << s) & 0xFFFFFFFF) | (x >> (32 - s));
|
||||
}
|
||||
|
||||
static inline u32 F(u32 x, u32 y, u32 z)
|
||||
{
|
||||
return (x & y) | ((~x) & z);
|
||||
}
|
||||
|
||||
static inline u32 G(u32 x, u32 y, u32 z)
|
||||
{
|
||||
return (x & y) | (x & z) | (y & z);
|
||||
}
|
||||
|
||||
static inline u32 H(u32 x, u32 y, u32 z)
|
||||
{
|
||||
return x ^ y ^ z;
|
||||
}
|
||||
|
||||
#define ROUND1(a,b,c,d,k,s) (a = lshift(a + F(b,c,d) + k, s))
|
||||
#define ROUND2(a,b,c,d,k,s) (a = lshift(a + G(b,c,d) + k + (u32)0x5A827999,s))
|
||||
#define ROUND3(a,b,c,d,k,s) (a = lshift(a + H(b,c,d) + k + (u32)0x6ED9EBA1,s))
|
||||
|
||||
/* XXX: this stuff can be optimized */
|
||||
static inline void le32_to_cpu_array(u32 *buf, unsigned int words)
|
||||
{
|
||||
while (words--) {
|
||||
*buf = ntohl(*buf);
|
||||
buf++;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void cpu_to_le32_array(u32 *buf, unsigned int words)
|
||||
{
|
||||
while (words--) {
|
||||
*buf = htonl(*buf);
|
||||
buf++;
|
||||
}
|
||||
}
|
||||
|
||||
static void md4_transform(u32 *hash, u32 const *in)
|
||||
{
|
||||
u32 a, b, c, d;
|
||||
|
||||
a = hash[0];
|
||||
b = hash[1];
|
||||
c = hash[2];
|
||||
d = hash[3];
|
||||
|
||||
ROUND1(a, b, c, d, in[0], 3);
|
||||
ROUND1(d, a, b, c, in[1], 7);
|
||||
ROUND1(c, d, a, b, in[2], 11);
|
||||
ROUND1(b, c, d, a, in[3], 19);
|
||||
ROUND1(a, b, c, d, in[4], 3);
|
||||
ROUND1(d, a, b, c, in[5], 7);
|
||||
ROUND1(c, d, a, b, in[6], 11);
|
||||
ROUND1(b, c, d, a, in[7], 19);
|
||||
ROUND1(a, b, c, d, in[8], 3);
|
||||
ROUND1(d, a, b, c, in[9], 7);
|
||||
ROUND1(c, d, a, b, in[10], 11);
|
||||
ROUND1(b, c, d, a, in[11], 19);
|
||||
ROUND1(a, b, c, d, in[12], 3);
|
||||
ROUND1(d, a, b, c, in[13], 7);
|
||||
ROUND1(c, d, a, b, in[14], 11);
|
||||
ROUND1(b, c, d, a, in[15], 19);
|
||||
|
||||
ROUND2(a, b, c, d,in[ 0], 3);
|
||||
ROUND2(d, a, b, c, in[4], 5);
|
||||
ROUND2(c, d, a, b, in[8], 9);
|
||||
ROUND2(b, c, d, a, in[12], 13);
|
||||
ROUND2(a, b, c, d, in[1], 3);
|
||||
ROUND2(d, a, b, c, in[5], 5);
|
||||
ROUND2(c, d, a, b, in[9], 9);
|
||||
ROUND2(b, c, d, a, in[13], 13);
|
||||
ROUND2(a, b, c, d, in[2], 3);
|
||||
ROUND2(d, a, b, c, in[6], 5);
|
||||
ROUND2(c, d, a, b, in[10], 9);
|
||||
ROUND2(b, c, d, a, in[14], 13);
|
||||
ROUND2(a, b, c, d, in[3], 3);
|
||||
ROUND2(d, a, b, c, in[7], 5);
|
||||
ROUND2(c, d, a, b, in[11], 9);
|
||||
ROUND2(b, c, d, a, in[15], 13);
|
||||
|
||||
ROUND3(a, b, c, d,in[ 0], 3);
|
||||
ROUND3(d, a, b, c, in[8], 9);
|
||||
ROUND3(c, d, a, b, in[4], 11);
|
||||
ROUND3(b, c, d, a, in[12], 15);
|
||||
ROUND3(a, b, c, d, in[2], 3);
|
||||
ROUND3(d, a, b, c, in[10], 9);
|
||||
ROUND3(c, d, a, b, in[6], 11);
|
||||
ROUND3(b, c, d, a, in[14], 15);
|
||||
ROUND3(a, b, c, d, in[1], 3);
|
||||
ROUND3(d, a, b, c, in[9], 9);
|
||||
ROUND3(c, d, a, b, in[5], 11);
|
||||
ROUND3(b, c, d, a, in[13], 15);
|
||||
ROUND3(a, b, c, d, in[3], 3);
|
||||
ROUND3(d, a, b, c, in[11], 9);
|
||||
ROUND3(c, d, a, b, in[7], 11);
|
||||
ROUND3(b, c, d, a, in[15], 15);
|
||||
|
||||
hash[0] += a;
|
||||
hash[1] += b;
|
||||
hash[2] += c;
|
||||
hash[3] += d;
|
||||
}
|
||||
|
||||
static inline void md4_transform_helper(struct md4_ctx *ctx)
|
||||
{
|
||||
le32_to_cpu_array(ctx->block, ARRAY_SIZE(ctx->block));
|
||||
md4_transform(ctx->hash, ctx->block);
|
||||
}
|
||||
|
||||
static int md4_init(struct shash_desc *desc)
|
||||
{
|
||||
struct md4_ctx *mctx = shash_desc_ctx(desc);
|
||||
|
||||
mctx->hash[0] = 0x67452301;
|
||||
mctx->hash[1] = 0xefcdab89;
|
||||
mctx->hash[2] = 0x98badcfe;
|
||||
mctx->hash[3] = 0x10325476;
|
||||
mctx->byte_count = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int md4_update(struct shash_desc *desc, const u8 *data, unsigned int len)
|
||||
{
|
||||
struct md4_ctx *mctx = shash_desc_ctx(desc);
|
||||
const u32 avail = sizeof(mctx->block) - (mctx->byte_count & 0x3f);
|
||||
|
||||
mctx->byte_count += len;
|
||||
|
||||
if (avail > len) {
|
||||
memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
|
||||
data, len);
|
||||
return 0;
|
||||
}
|
||||
|
||||
memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
|
||||
data, avail);
|
||||
|
||||
md4_transform_helper(mctx);
|
||||
data += avail;
|
||||
len -= avail;
|
||||
|
||||
while (len >= sizeof(mctx->block)) {
|
||||
memcpy(mctx->block, data, sizeof(mctx->block));
|
||||
md4_transform_helper(mctx);
|
||||
data += sizeof(mctx->block);
|
||||
len -= sizeof(mctx->block);
|
||||
}
|
||||
|
||||
memcpy(mctx->block, data, len);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int md4_final(struct shash_desc *desc, u8 *out)
|
||||
{
|
||||
struct md4_ctx *mctx = shash_desc_ctx(desc);
|
||||
const unsigned int offset = mctx->byte_count & 0x3f;
|
||||
char *p = (char *)mctx->block + offset;
|
||||
int padding = 56 - (offset + 1);
|
||||
|
||||
*p++ = 0x80;
|
||||
if (padding < 0) {
|
||||
memset(p, 0x00, padding + sizeof (u64));
|
||||
md4_transform_helper(mctx);
|
||||
p = (char *)mctx->block;
|
||||
padding = 56;
|
||||
}
|
||||
|
||||
memset(p, 0, padding);
|
||||
mctx->block[14] = mctx->byte_count << 3;
|
||||
mctx->block[15] = mctx->byte_count >> 29;
|
||||
le32_to_cpu_array(mctx->block, (sizeof(mctx->block) -
|
||||
sizeof(u64)) / sizeof(u32));
|
||||
md4_transform(mctx->hash, mctx->block);
|
||||
cpu_to_le32_array(mctx->hash, ARRAY_SIZE(mctx->hash));
|
||||
memcpy(out, mctx->hash, sizeof(mctx->hash));
|
||||
memset(mctx, 0, sizeof(*mctx));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static char to_hex(u8 v)
|
||||
{
|
||||
v = v & 0xf;
|
||||
if (v < 0xa)
|
||||
return '0' + v;
|
||||
return 'a' + v - 0xa;
|
||||
}
|
||||
|
||||
void md4hexf(const char *path, char *hash)
|
||||
{
|
||||
struct md4_ctx mctx;
|
||||
md4_init(&mctx);
|
||||
|
||||
int fd = open(path, O_RDONLY);
|
||||
if (fd >= 0) {
|
||||
u8 buffer[MD4_HMAC_BLOCK_SIZE];
|
||||
while (1) {
|
||||
ssize_t count = read(fd, buffer, sizeof(buffer));
|
||||
if (count <= 0)
|
||||
break;
|
||||
md4_update(&mctx, buffer, (unsigned)count);
|
||||
}
|
||||
close(fd);
|
||||
}
|
||||
|
||||
u8 out[MD4_DIGEST_SIZE];
|
||||
md4_final(&mctx, out);
|
||||
|
||||
for (int i = 0; i < MD4_DIGEST_SIZE; i++) {
|
||||
hash[2*i+0] = to_hex(out[i] >> 4);
|
||||
hash[2*i+1] = to_hex(out[i] & 0xf);
|
||||
}
|
||||
hash[2*MD4_DIGEST_SIZE] = 0;
|
||||
}
|
||||
7
src/tint2conf/md4.h
Normal file
7
src/tint2conf/md4.h
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
#ifndef MD4_H
|
||||
#define MD4_H
|
||||
|
||||
#define MD4_HEX_SIZE 33
|
||||
void md4hexf(const char *path, char *hash);
|
||||
|
||||
#endif
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
#include "strnatcmp.h"
|
||||
#include "theme_view.h"
|
||||
#include "common.h"
|
||||
#include "md4.h"
|
||||
|
||||
// The data columns that we export via the tree model interface
|
||||
GtkWidget *g_theme_view;
|
||||
|
|
@ -154,6 +155,13 @@ void theme_list_append(const gchar *path)
|
|||
|
||||
gboolean update_snapshot()
|
||||
{
|
||||
{
|
||||
gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);
|
||||
if (!g_file_test(tint2_cache_dir, G_FILE_TEST_IS_DIR))
|
||||
g_mkdir(tint2_cache_dir, 0700);
|
||||
g_free(tint2_cache_dir);
|
||||
}
|
||||
|
||||
const gint PADDING = 20;
|
||||
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
|
||||
|
|
@ -162,19 +170,7 @@ gboolean update_snapshot()
|
|||
gboolean have_iter;
|
||||
|
||||
int num_updates = 0;
|
||||
have_iter = gtk_tree_model_get_iter_first(model, &iter);
|
||||
while (have_iter) {
|
||||
GdkPixbuf *pixbuf;
|
||||
gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &pixbuf, -1);
|
||||
if (pixbuf)
|
||||
g_object_unref(pixbuf);
|
||||
else
|
||||
num_updates++;
|
||||
have_iter = gtk_tree_model_iter_next(model, &iter);
|
||||
}
|
||||
gboolean need_pls_wait = num_updates > 3;
|
||||
if (need_pls_wait)
|
||||
create_please_wait(GTK_WINDOW(g_window));
|
||||
gboolean need_pls_wait = FALSE;
|
||||
|
||||
have_iter = gtk_tree_model_get_iter_first(model, &iter);
|
||||
while (have_iter) {
|
||||
|
|
@ -186,27 +182,29 @@ gboolean update_snapshot()
|
|||
continue;
|
||||
}
|
||||
|
||||
// build panel's snapshot
|
||||
gchar *path;
|
||||
gtk_tree_model_get(model, &iter, COL_THEME_FILE, &path, -1);
|
||||
|
||||
char fname[128];
|
||||
sprintf(fname, "tint2-%d.png", (int)getpid());
|
||||
|
||||
gchar *snap = g_build_filename(g_get_tmp_dir(), fname, NULL);
|
||||
g_remove(snap);
|
||||
char hash[MD4_HEX_SIZE + 4];
|
||||
md4hexf(path, hash);
|
||||
strcat(hash, ".png");
|
||||
|
||||
gchar *snap = g_build_filename(g_get_user_cache_dir(), "tint2", hash, NULL);
|
||||
pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
|
||||
if (!pixbuf) {
|
||||
gchar *cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\' 1>/dev/null 2>/dev/null", path, snap);
|
||||
num_updates++;
|
||||
if (num_updates > 3 && !need_pls_wait) {
|
||||
need_pls_wait = TRUE;
|
||||
create_please_wait(GTK_WINDOW(g_window));
|
||||
}
|
||||
if (system(cmd) == 0) {
|
||||
// load
|
||||
pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
|
||||
if (pixbuf == NULL) {
|
||||
printf("snapshot NULL : %s\n", cmd);
|
||||
}
|
||||
}
|
||||
g_free(cmd);
|
||||
}
|
||||
|
||||
g_remove(snap);
|
||||
g_free(snap);
|
||||
g_free(path);
|
||||
|
||||
|
|
|
|||
|
|
@ -219,3 +219,5 @@ src/tint2conf/background_gui.c
|
|||
src/tint2conf/gui.h
|
||||
src/tint2conf/gradient_gui.h
|
||||
src/tint2conf/gradient_gui.c
|
||||
src/tint2conf/md4.h
|
||||
src/tint2conf/md4.c
|
||||
|
|
|
|||
Loading…
Reference in a new issue