• R/O
  • SSH
  • HTTPS

tsukurimashou: Commit


Commit MetaInfo

Revision503 (tree)
Time2014-03-05 12:21:26
Authormskala

Log Message

remove some dead code

Change Summary

Incremental Difference

--- trunk/fontanvil/fontanvil/collabclientpriv.h (revision 502)
+++ trunk/fontanvil/fontanvil/collabclientpriv.h (nonexistent)
@@ -1,160 +0,0 @@
1-/******************************************************************************
2-*******************************************************************************
3-*******************************************************************************
4-
5- Copyright (C) 2013 Ben Martin
6-
7- This file is part of FontAnvil.
8-
9- FontAnvil is free software: you can redistribute it and/or modify
10- it under the terms of the GNU General Public License as published by
11- the Free Software Foundation, either version 3 of the License, or
12- (at your option) any later version.
13-
14- FontAnvil is distributed in the hope that it will be useful,
15- but WITHOUT ANY WARRANTY; without even the implied warranty of
16- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17- GNU General Public License for more details.
18-
19- You should have received a copy of the GNU General Public License
20- along with FontAnvil. If not, see <http://www.gnu.org/licenses/>.
21-
22- For more details see the COPYING.gplv3 file in the root directory of this
23- distribution.
24-
25-*******************************************************************************
26-*******************************************************************************
27-******************************************************************************/
28-
29-/**
30- *
31- * These are definitions that both collabclient and collabclientui
32- * should share, but which are not really intended to be public. This
33- * file should only be included from the aforementioned files.
34- *
35- * At the moment this file must be included within a BUILD_COLLAB guard.
36- *
37- */
38-#ifndef _ALREADY_INCLUDED_FF_COLLAB_CLIENT_PRIV_H
39-#define _ALREADY_INCLUDED_FF_COLLAB_CLIENT_PRIV_H
40-
41-#define MAGIC_VALUE 0xbeef
42-#define SUBTREE "/client/"
43-
44-#define DEBUG zclock_log
45-
46-#define MSG_TYPE_SFD "msg_type_sfd"
47-#define MSG_TYPE_UNDO "msg_type_undo"
48-#define MSG_TYPE_UNDO_FONTLEVEL "msg_type_undo_fontlevel"
49-
50-//
51-// Set to true if you want to see the raw SFD undo fragments which
52-// are moving to/from the server.
53-//
54-#define DEBUG_SHOW_SFD_CHUNKS 0
55-
56-
57-
58-#define beacon_announce_protocol_sz 20
59-#define beacon_announce_uuid_sz 40
60-#define beacon_announce_username_sz 50
61-#define beacon_announce_machinename_sz 50
62-#define beacon_announce_ip_sz 20
63-#define beacon_announce_fontname_sz 40
64-
65-
66-#include "ffglib.h"
67-#include "fontanvil-config.h"
68-#include "ustring.h"
69-#include "collabclient.h"
70-#include "gfile.h"
71-#include "views.h"
72-#include "gwidget.h"
73-#include "gnetwork.h"
74-
75-
76-
77-
78-typedef struct {
79- uint8_t protocol [beacon_announce_protocol_sz];
80- uint8_t version;
81- uint8_t uuid [beacon_announce_uuid_sz];
82- uint8_t username [beacon_announce_username_sz];
83- uint8_t machinename[beacon_announce_machinename_sz];
84- uint16_t port; // network byte order //
85-
86- // The following dont have any value to sending, they
87- // are only used in the local hash version of this data structure.
88- time_t last_msg_from_peer_time;
89- uint8_t ip[beacon_announce_ip_sz];
90- uint8_t fontname[beacon_announce_fontname_sz];
91-} beacon_announce_t;
92-
93-/**
94- * After collabclient_ensureClientBeacon() is called, a list of
95- * servers is collected over time. This function gives full access to
96- * that list and should be treated with caution, its ok to use
97- * internally in fontanvil but it uses the above struct which might
98- * change over time, so its not a client API.
99- *
100- * The return is a hash of beacon_announce_t instances.
101- *
102- * Do NOT free the return value or any of it's contents, none of it is
103- * yours.
104- */
105-extern GHashTable* collabclient_getServersFromBeaconInfomration( void );
106-
107-
108-
109-#ifdef BUILD_COLLAB
110-
111-#include "collab/zmq_kvmsg.h"
112-#include "czmq.h"
113-#include <zbeacon.h>
114-
115-typedef struct {
116-
117- int magic_number; // Magic number to test if the pointer is likely valid
118-
119- zctx_t *ctx; // Main zeromq Context
120- zloop_t *loop; // main zloop reactor
121- char* address; // address of the server
122- int port; // Base port we're working on, we use
123- // base+n for all other sockets.
124- zhash_t *kvmap; // Key-value store that we manage
125- int64_t sequence; // How many updates we're at
126-
127- Undoes* preserveUndo; //< Used by collabclient_sendRedo to only send an undo if one has
128- // been made
129-
130- /*
131- * The roundTripTimer fires X milliseconds after we send a redo to
132- * the server. The roundTripTimerWaitingSeq is a cache of the
133- * sequence that we sent to the server. If we don't get a reply to
134- * the update that we sent on subscriber within the timeout then
135- * we assume there is a network problem and alert the user.
136- */
137- BackgroundTimer_t* roundTripTimer;
138- int roundTripTimerWaitingSeq;
139-
140- //
141- // A DEALER that we receive snapshot requests from the server on
142- void *snapshot;
143-
144- // A SUB that we listen to the server telling us about each new
145- // update from other clients
146- void *subscriber;
147-
148- // We send our updates to the server (and thus to all other
149- // client's subscriber sockets) on this socket.
150- void *publisher;
151-
152- // Monotonically increasing number used to tag outgoing msgs
153- // to the publisher
154- int publisher_sendseq;
155-
156-
157-} cloneclient_t;
158-
159-#endif // build_collab
160-#endif // already_included_ff_collab_client_priv_h
--- trunk/fontanvil/fontanvil/pluginloading.c (revision 502)
+++ trunk/fontanvil/fontanvil/pluginloading.c (nonexistent)
@@ -1,97 +0,0 @@
1-/* Copyright (C) 2005-2012 by George Williams */
2-/*
3- * Redistribution and use in source and binary forms, with or without
4- * modification, are permitted provided that the following conditions are met:
5-
6- * Redistributions of source code must retain the above copyright notice, this
7- * list of conditions and the following disclaimer.
8-
9- * Redistributions in binary form must reproduce the above copyright notice,
10- * this list of conditions and the following disclaimer in the documentation
11- * and/or other materials provided with the distribution.
12-
13- * The name of the author may not be used to endorse or promote products
14- * derived from this software without specific prior written permission.
15-
16- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26- */
27-
28-#include <fontanvil-config.h>
29-#include <intl.h>
30-#include <basics.h>
31-#include <pluginloading.h>
32-#include <string.h>
33-
34-static int inited = false;
35-
36-void init_plugins(void) {
37- int err;
38-
39- if (!inited)
40- {
41- err = lt_dlinit();
42- if (1 < err)
43- {
44- fprintf(stderr, "%d errors encountered during libltdl startup.\n",
45- err);
46- abort();
47- }
48- else if (1 == err)
49- {
50- fprintf(stderr, "1 error encountered during libltdl startup.\n");
51- abort();
52- }
53-
54-#ifdef PLUGINDIR
55- lt_dladdsearchdir(PLUGINDIR);
56-#endif /* PLUGINDIR */
57-
58- inited = true;
59- }
60-}
61-
62-int plugins_are_initialized(void) {
63- return inited;
64-}
65-
66-/* Load (or fake loading) a named plugin that is somewhere in the path
67- * list for lt_dlopenext(). Optionally logs a message. Returns the
68- * plugin handle, or NULL. */
69-lt_dlhandle load_plugin(const char *dynamic_lib_name, void (*logger)(const char *fmt,...)) {
70- lt_dlhandle plugin;
71- int (*init)(void);
72-
73- plugin = lt_dlopenext(dynamic_lib_name);
74- if ( plugin == NULL )
75- {
76- if (logger != NULL)
77- logger(_("Failed to dlopen: %s\n%s"), dynamic_lib_name, lt_dlerror());
78- }
79- else
80- {
81- init = (int (*)(void)) lt_dlsym(plugin,"FontAnvilInit");
82- if ( init == NULL )
83- {
84- if (logger != NULL)
85- logger(_("Failed to find init function in %s"), dynamic_lib_name);
86- lt_dlclose(plugin);
87- plugin = NULL;
88- }
89- else if ( (*init)()==0 )
90- { /* Init routine in charge of any
91- * error messages */
92- lt_dlclose(plugin);
93- plugin = NULL;
94- }
95- }
96- return plugin;
97-}
--- trunk/fontanvil/fontanvil/plugins.c (revision 502)
+++ trunk/fontanvil/fontanvil/plugins.c (nonexistent)
@@ -1,53 +0,0 @@
1-/* Copyright (C) 2005-2012 by George Williams */
2-/*
3- * Redistribution and use in source and binary forms, with or without
4- * modification, are permitted provided that the following conditions are met:
5-
6- * Redistributions of source code must retain the above copyright notice, this
7- * list of conditions and the following disclaimer.
8-
9- * Redistributions in binary form must reproduce the above copyright notice,
10- * this list of conditions and the following disclaimer in the documentation
11- * and/or other materials provided with the distribution.
12-
13- * The name of the author may not be used to endorse or promote products
14- * derived from this software without specific prior written permission.
15-
16- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26- */
27-
28-#include "plugins.h"
29-#include "pluginloading.h"
30-#include <basics.h>
31-
32-/* Load (or fake loading) a named plugin that is somewhere in the path
33- * list for lt_dlopenext(). Returns 'true' on success; otherwise
34- * returns 'false'. */
35-int LoadPlugin(const char *dynamic_lib_name) {
36- lt_dlhandle plugin;
37- plugin = load_plugin(dynamic_lib_name, LogError);
38- return (plugin != NULL);
39-}
40-
41-/* Callback function for LoadPluginDir(). */
42-static int plugin_loading_callback(const char *dynamic_lib_name, void *UNUSED(data)) {
43- (void) LoadPlugin(dynamic_lib_name);
44- return 0;
45-}
46-
47-/* Load all the plugins in the given search_path, if search_path !=
48- NULL. Load plugins in the "user-defined" search path, if
49- search_path == NULL. */
50-void LoadPluginDir(const char *search_path) {
51- const char *path = (search_path == NULL) ? lt_dlgetsearchpath() : search_path;
52- (void) lt_dlforeachfile(path, plugin_loading_callback, NULL);
53-}
--- trunk/fontanvil/fontanvil/plugins.h (revision 502)
+++ trunk/fontanvil/fontanvil/plugins.h (nonexistent)
@@ -1,98 +0,0 @@
1-/* Copyright (C) 2005-2012 by George Williams */
2-/*
3- * Redistribution and use in source and binary forms, with or without
4- * modification, are permitted provided that the following conditions are met:
5-
6- * Redistributions of source code must retain the above copyright notice, this
7- * list of conditions and the following disclaimer.
8-
9- * Redistributions in binary form must reproduce the above copyright notice,
10- * this list of conditions and the following disclaimer in the documentation
11- * and/or other materials provided with the distribution.
12-
13- * The name of the author may not be used to endorse or promote products
14- * derived from this software without specific prior written permission.
15-
16- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26- */
27-
28-/* If a user wants to write a fontanvil plugin s/he should include this file */
29-
30-/*
31- I envision that there will eventually be three types of plug-ins. At the
32- moment I am only supporting two of them.
33-
34- * A plug in which adds a new encoding to the encoding/force encoding
35- menus.
36- * A plug in which adds a new scripting command
37- * A plug in which adds a new menu item.
38- (I haven't figure out how I want to do this last. So I'm not currently
39- supporting it.)
40-
41- A plug-in should be a dynamic library.
42- Plug-ins will be loaded at start up if they are in the default plugin
43- directory, or a script may explicitly invoke a LoadPlugin() call
44- and pass a filename.
45- Each plug-in should contain an entry-point:
46- void FontAnvilInit(void);
47- When FF loads a plug-in it will call this entry point.
48- I expect that this routine in term will call one (or more) of the install
49- routines (though it can do whatever it likes):
50- * AddEncoding(name,enc-to-unicode-func,unicode-to-enc-func)
51- * AddScriptingCommand(name,func,needs-font)
52-
53- Once loaded, there is no way to remove a plug in -- but you can map a
54- plug in's name to do something else.
55-
56- I am presuming that plugins will be linked against libfontanvil and
57- that it will have access to all routines declared in fontanvil's
58- header files. I do not expect to turn this into a real library with
59- a true API. It's just a catch all bag of routines I have needed.
60- It's not documented either.
61-*/
62-
63- /* Entry point all plugins must contain */
64-extern int FontAnvilInit(void);
65- /* If the load fails, then this routine should return 0, else 1 */
66- /* if it returns 0, fontanvil will dlclose the shared lib */
67- /* FontAnvil will not complain itself. FontAnvilInit should */
68- /* call LogError (or gwwv_post_error or whatever) if it wants */
69- /* to report failure */
70-
71- /* AddScriptingCommand is documented within */
72-#include "scripting.h"
73-
74- /* AddEncoding is documented here */
75-typedef int (*EncFunc)(int);
76-extern int AddEncoding(char *name,EncFunc enc_to_uni,EncFunc uni_to_enc,int max);
77- /* The "Encoding" here is a little different from what you normally see*/
78- /* It isn't a mapping from a byte stream to unicode, but from an int */
79- /* to unicode. If we have an 8/16 encoding (EUC or SJIS) then the */
80- /* single byte entries will be numbers less than <256 and the */
81- /* multibyte entries will be numbers >=256. So an encoding might be */
82- /* valid for the domain [0x20..0x7f] [0xa1a1..0xfefe] */
83- /* In other words, we're interested in the ordering displayed in the */
84- /* fontview. Nothing else */
85- /* The max value need not be exact (though it should be at least as big)*/
86- /* if you create a new font with the given encoding, then the font will */
87- /* have max slots in it by default */
88- /* A return value of -1 (from an EncFunc) indicates no mapping */
89- /* AddEncoding returns 1 if the encoding was added, 2 if it replaced */
90- /* an existing encoding, 0 if you attempt to replace a builtin */
91- /* encoding */
92-
93- /* Internal routines. Plugins shouldn't need these */
94-extern int LoadPlugin(const char *dynamic_lib_name);
95- /* Loads a single plugin file */
96-extern void LoadPluginDir(const char *search_path);
97- /* Loads any dynamic libs from this search path. if search_path is
98- * NULL loads from the path returned by lt_dlgetsearchpath() */
--- trunk/fontanvil/fontanvil/collabclient.c (revision 502)
+++ trunk/fontanvil/fontanvil/collabclient.c (nonexistent)
@@ -1,154 +0,0 @@
1-/******************************************************************************
2-*******************************************************************************
3-*******************************************************************************
4-
5- Copyright (C) 2013 Ben Martin
6-
7- This file is part of FontAnvil.
8-
9- FontAnvil is free software: you can redistribute it and/or modify
10- it under the terms of the GNU General Public License as published by
11- the Free Software Foundation, either version 3 of the License, or
12- (at your option) any later version.
13-
14- FontAnvil is distributed in the hope that it will be useful,
15- but WITHOUT ANY WARRANTY; without even the implied warranty of
16- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17- GNU General Public License for more details.
18-
19- You should have received a copy of the GNU General Public License
20- along with FontAnvil. If not, see <http://www.gnu.org/licenses/>.
21-
22- For more details see the COPYING.gplv3 file in the root directory of this
23- distribution.
24-
25-*******************************************************************************
26-*******************************************************************************
27-******************************************************************************/
28-
29-int pref_collab_sessionJoinTimeoutMS = 1000;
30-int pref_collab_roundTripTimerMS = 2000;
31-
32-#include "collabclientpriv.h"
33-
34-
35-void collabclient_CVPreserveStateCalled( CharViewBase *cv )
36-{
37-#ifdef BUILD_COLLAB
38-
39- cloneclient_t* cc = cv->fv->collabClient;
40- if( !cc )
41- return;
42-
43- Undoes *undo = cv->layerheads[cv->drawmode]->undoes;
44- cc->preserveUndo = undo;
45-
46-#endif
47-}
48-
49-static int generatingUndoForWire = 1;
50-
51-void collabclient_setGeneratingUndoForWire( int v )
52-{
53- generatingUndoForWire = v;
54-}
55-
56-int collabclient_generatingUndoForWire( CharViewBase *cv )
57-{
58-#ifdef BUILD_COLLAB
59- if( collabclient_inSession( cv ) )
60- {
61- return generatingUndoForWire;
62- }
63-#endif
64- return 0;
65-}
66-
67-int collabclient_inSession( CharViewBase *cv )
68-{
69-#ifdef BUILD_COLLAB
70-
71- if( !cv )
72- return 0;
73- if( !cv->fv )
74- return 0;
75- cloneclient_t* cc = cv->fv->collabClient;
76- return cc!=0;
77-
78-#endif
79- return 0;
80-}
81-
82-int collabclient_inSessionFV( FontViewBase* fv )
83-{
84-#ifdef BUILD_COLLAB
85-
86- if( !fv )
87- return 0;
88- cloneclient_t* cc = fv->collabClient;
89- return cc!=0;
90-
91-#endif
92- return 0;
93-}
94-
95-
96-
97-enum collabState_t
98-collabclient_getState( FontViewBase* fv )
99-{
100-#ifdef BUILD_COLLAB
101-
102- if( !fv )
103- return cs_neverConnected;
104- return fv->collabState;
105-
106-#else
107-
108- return cs_neverConnected;
109-
110-#endif
111-}
112-
113-char*
114-collabclient_stateToString( enum collabState_t s )
115-{
116- switch( s )
117- {
118- case cs_neverConnected:
119- return "";
120- case cs_disconnected:
121- return _("Disconnected");
122- case cs_server:
123- return _("Collab Server");
124- case cs_client:
125- return _("Collab Client");
126- }
127- return _("Unknown Collab State!");
128-}
129-
130-
131-
132-void collabclient_SCPreserveStateCalled( SplineChar *sc )
133-{
134-#ifdef BUILD_COLLAB
135-
136- if( !sc->parent || !sc->parent->fv )
137- return;
138-
139- FontViewBase* fv = sc->parent->fv;
140- cloneclient_t* cc = fv->collabClient;
141- if( !cc )
142- return;
143-
144- Undoes *undo = sc->layers[ly_fore].undoes;
145- cc->preserveUndo = undo;
146-
147-#endif
148-}
149-
150-
151-
152-
153-
154-
--- trunk/fontanvil/fontanvil/collabclient.h (revision 502)
+++ trunk/fontanvil/fontanvil/collabclient.h (nonexistent)
@@ -1,119 +0,0 @@
1-/******************************************************************************
2-*******************************************************************************
3-*******************************************************************************
4-
5- Copyright (C) 2013 Ben Martin
6-
7- This file is part of FontAnvil.
8-
9- FontAnvil is free software: you can redistribute it and/or modify
10- it under the terms of the GNU General Public License as published by
11- the Free Software Foundation, either version 3 of the License, or
12- (at your option) any later version.
13-
14- FontAnvil is distributed in the hope that it will be useful,
15- but WITHOUT ANY WARRANTY; without even the implied warranty of
16- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17- GNU General Public License for more details.
18-
19- You should have received a copy of the GNU General Public License
20- along with FontAnvil. If not, see <http://www.gnu.org/licenses/>.
21-
22- For more details see the COPYING.gplv3 file in the root directory of this
23- distribution.
24-
25-*******************************************************************************
26-*******************************************************************************
27-******************************************************************************/
28-
29-#ifndef _ALREADY_INCLUDED_FF_COLLAB_CLIENT_H
30-#define _ALREADY_INCLUDED_FF_COLLAB_CLIENT_H
31-
32-#include <fontanvil-config.h>
33-#include "baseviews.h"
34-#include "views.h"
35-
36-extern int pref_collab_sessionJoinTimeoutMS;
37-extern int pref_collab_roundTripTimerMS;
38-
39-
40-
41-
42-/**
43- * Sometimes code *might* have created a new undo in the process of a
44- * complex set of tests and nested calls. To help that code, the
45- * CVAddUndo() calls this function to inform the collab code that a
46- * new undo has infact been created.
47- *
48- * So the client code can just call sendRedo() and if there was no new
49- * undo created then nothing is sent to the collab session. On the
50- * other hand if an undo was created, then it will have called here
51- * during the process of being added to the undo stack, so the
52- * sendRedo() will send this new undo to ther server.
53- *
54- * A classic case for this chain of events is clicking on the charview
55- * canvas. If there was nothing selected and the user clicks on the
56- * background then there will be no new undo created. If the user
57- * picks a new node then there *will* be a new undo created. Either
58- * way, the client code can safely just call sendRedo() and if there
59- * was a new undo created it will be sent, if not then nothing will be
60- * sent.
61- */
62-extern void collabclient_CVPreserveStateCalled( CharViewBase *cv );
63-extern void collabclient_SCPreserveStateCalled( SplineChar *sc );
64-
65-
66-/**
67- * Some parts of the system like charview's "undo" menu item might need
68- * to override this setting so that UI redraws happen by default.
69- */
70-extern void collabclient_setGeneratingUndoForWire( int v );
71-
72-
73-/**
74- * If an undo takes place, it needs to know if it should repaint
75- * the window to reflect the changes. If collabclient_generatingUndoForWire
76- * returns true, then we don't really want to repaint just yet.
77- *
78- * Consider the process of events
79- *
80- * (a) User performs moving the top node in A left a bit
81- * (b) the collab code runs "undo" so it can get the redo information
82- * (c) the undo repaints the window
83- * (d) the redo info is sent to the server
84- * (e) delay
85- * (f) server publishes this redo to all clients (including us)
86- * (g) we "redo" the information from the server
87- * (h) the redo repaints the window
88- *
89- * We would give a better user experience if (c) doesn't happen. So
90- * the user doesn't see the older state appear and cancelled out again
91- * moments later.
92- *
93- * So an undo should check this function and
94- * if( collabclient_generatingUndoForWire() )
95- * {
96- * dont repaint UI
97- * }
98- */
99-extern int collabclient_generatingUndoForWire( CharViewBase *cv );
100-
101-
102-
103-/**
104- * Return >0 if this charview is part of a collab session
105- */
106-extern int collabclient_inSession( CharViewBase *cv );
107-extern int collabclient_inSessionFV( FontViewBase* fv );
108-
109-
110-/**
111- * Get the state as a enum or string. This can tell the user if we
112- * have never connected, are running a local server, or are simply a
113- * client. Also we can let them know if we were once connected but are
114- * now disconnected.
115- */
116-extern enum collabState_t collabclient_getState( FontViewBase* fv );
117-extern char* collabclient_stateToString( enum collabState_t s );
118-
119-#endif
--- trunk/fontanvil/fontanvil/encoding.c (revision 502)
+++ trunk/fontanvil/fontanvil/encoding.c (revision 503)
@@ -33,11 +33,11 @@
3333 #include <sys/types.h>
3434 #include <dirent.h>
3535 #include <gfile.h>
36-#include "plugins.h"
3736 #include "encoding.h"
3837 #include "ffglib.h"
3938 #include <glib/gprintf.h>
4039
40+typedef int (*EncFunc)(int);
4141 Encoding *default_encoding = NULL;
4242
4343 static int32 tex_base_encoding[] = {
--- trunk/fontanvil/fontanvil/macbinary.c (revision 502)
+++ trunk/fontanvil/fontanvil/macbinary.c (revision 503)
@@ -35,14 +35,7 @@
3535 #include <ustring.h>
3636 #include "ttf.h"
3737 #include "psfont.h"
38-#if __Mac
39-# include <ctype.h>
40-# include "carbon.h"
41-#else
4238 # include <utype.h>
43-#undef __Mac
44-#define __Mac 0
45-#endif
4639
4740 const int mac_dpi = 72;
4841 /* I had always assumed that the mac still believed in 72dpi screens, but I */
@@ -1350,7 +1343,6 @@
13501343 }
13511344
13521345 static int DumpMacBinaryHeader(FILE *res,struct macbinaryheader *mb) {
1353-#if !__Mac
13541346 uint8 header[128], *hpt; char buffer[256], *pt, *dpt;
13551347 uint32 len;
13561348 time_t now;
@@ -1427,78 +1419,6 @@
14271419 fseek(res,0,SEEK_SET);
14281420 fwrite(header,1,sizeof(header),res);
14291421 return( true );
1430-#else
1431- int ret;
1432- FSRef ref, parentref;
1433-#if __LP64__
1434- FSIORefNum macfile;
1435-#else
1436- short macfile;
1437-#endif
1438- char *buf, *dirname, *pt, *fname;
1439- HFSUniStr255 resforkname;
1440- FSCatalogInfo info;
1441- long len;
1442- unichar_t *filename;
1443- ByteCount whocares;
1444- /* When on the mac let's just create a real resource fork. We do this by */
1445- /* creating a mac file with a resource fork, opening that fork, and */
1446- /* dumping all the data in the temporary file after the macbinary header */
1447-
1448- /* The mac file routines are really lovely. I can't convert a pathspec to */
1449- /* an FSRef unless the file exists. That is incredibly stupid and annoying of them */
1450- /* But the directory should exist... */
1451- fname = mb->macfilename?mb->macfilename:mb->binfilename;
1452- dirname = copy(fname);
1453- pt = strrchr(dirname,'/');
1454- if ( pt!=NULL )
1455- pt[1] = '\0';
1456- else {
1457- free(dirname);
1458- dirname = copy(".");
1459- }
1460- ret=FSPathMakeRef( (uint8 *) dirname,&parentref,NULL);
1461- free(dirname);
1462- if ( ret!=noErr )
1463-return( false );
1464-
1465- memset(&info,0,sizeof(info));
1466- ((FInfo *) (info.finderInfo))->fdType = mb->type;
1467- ((FInfo *) (info.finderInfo))->fdCreator = mb->creator;
1468- pt = strrchr(fname,'/');
1469- filename = def2u_copy(pt==NULL?fname:pt+1);
1470- { UniChar *ucs2fn = malloc((u_strlen(filename)+1) * sizeof(UniChar));
1471- int i;
1472- for ( i=0; filename[i]!=0; ++i )
1473- ucs2fn[i] = filename[i];
1474- ucs2fn[i] = 0;
1475- ret = FSCreateFileUnicode(&parentref,u_strlen(filename), ucs2fn,
1476- kFSCatInfoFinderInfo, &info, &ref, NULL);
1477- free(ucs2fn);
1478- }
1479- free(filename);
1480- if ( ret==dupFNErr ) {
1481- /* File already exists, create failed, didn't get an FSRef */
1482- ret=FSPathMakeRef( (uint8 *) fname,&ref,NULL);
1483- }
1484- if ( ret!=noErr )
1485-return( false );
1486-
1487- FSGetResourceForkName(&resforkname);
1488- FSCreateFork(&ref,resforkname.length,resforkname.unicode); /* I don't think this is needed, but it doesn't hurt... */
1489- ret = FSOpenFork(&ref,resforkname.length,resforkname.unicode,fsWrPerm,&macfile);
1490- if ( ret!=noErr )
1491-return( false );
1492- FSSetForkSize(macfile,fsFromStart,0);/* Truncate it just in case it existed... */
1493- fseek(res,128,SEEK_SET); /* Everything after the mac binary header in */
1494- /* the temp file is resource fork */
1495- buf = malloc(8*1024);
1496- while ( (len=fread(buf,1,8*1024,res))>0 )
1497- FSWriteFork(macfile,fsAtMark,0,len,buf,&whocares);
1498- FSCloseFork(macfile);
1499- free(buf);
1500-return( true );
1501-#endif
15021422 }
15031423
15041424 static void WriteDummyMacHeaders(FILE *res) {
@@ -1553,9 +1473,6 @@
15531473 struct macbinaryheader header;
15541474 int lcfn = false, lcfam = false;
15551475 char buffer[63];
1556-#if __Mac
1557- char *pt;
1558-#endif
15591476
15601477 temppfb = tmpfile();
15611478 if ( temppfb==NULL )
@@ -1584,9 +1501,6 @@
15841501 return( 0 );
15851502 }
15861503
1587- if ( __Mac && format==ff_pfbmacbin )
1588- res = tmpfile();
1589- else
15901504 res = fopen(filename,"wb+");
15911505 if ( res==NULL ) {
15921506 fclose(temppfb);
@@ -1603,15 +1517,7 @@
16031517 DumpResourceMap(res,resources,format);
16041518 free( resources[0].res );
16051519
1606-#if __Mac
1607- header.macfilename = malloc(strlen(filename)+strlen(buffer)+1);
1608- strcpy(header.macfilename,filename);
1609- pt = strrchr(header.macfilename,'/');
1610- if ( pt==NULL ) pt=header.macfilename-1;
1611- strcpy(pt+1,buffer);
1612-#else
16131520 header.macfilename = buffer;
1614-#endif
16151521 /* Adobe uses a creator of ASPF (Adobe Systems PostScript Font I assume) */
16161522 /* Fontographer uses ACp1 (Altsys Corp. PostScript type 1???) */
16171523 /* Both include an FREF, BNDL, ICON* and comment */
@@ -1621,9 +1527,6 @@
16211527 ret = DumpMacBinaryHeader(res,&header);
16221528 if ( ferror(res) ) ret = 0;
16231529 if ( fclose(res)==-1 ) ret = 0;
1624-#if __Mac
1625- free(header.macfilename);
1626-#endif
16271530 return( ret );
16281531 }
16291532
@@ -1648,7 +1551,7 @@
16481551 if ( bf!=bf_ttf && bf!=bf_sfnt_dfont )
16491552 bsizes = NULL; /* as far as the FOND for the truetype is concerned anyway */
16501553
1651- if ( (__Mac && format==ff_ttfmacbin) || strstr(filename,"://")!=NULL )
1554+ if ( strstr(filename,"://")!=NULL )
16521555 res = tmpfile();
16531556 else
16541557 res = fopen(filename,"wb+");
@@ -1725,12 +1628,9 @@
17251628 if ( dpt==NULL )
17261629 dpt = pt+strlen(pt);
17271630 }
1728- strcpy(dpt,is_dfont?".bmap.dfont":__Mac?".bmap":".bmap.bin");
1631+ strcpy(dpt,is_dfont?".bmap.dfont":".bmap.bin");
17291632
1730- if ( __Mac && !is_dfont )
1731- res = tmpfile();
1732- else
1733- res = fopen(binfilename,"wb+");
1633+ res = fopen(binfilename,"wb+");
17341634 if ( res==NULL ) {
17351635 free(binfilename);
17361636 return( 0 );
@@ -1792,9 +1692,7 @@
17921692 for ( sfi=sfs; sfi!=NULL; sfi = sfi->next ) {
17931693 char *tempname;
17941694 MakeMacPSName(buffer,sfi->sf);
1795-#if !__Mac
17961695 strcat(buffer,".bin");
1797-#endif
17981696 tempname = malloc(strlen(filename)+strlen(buffer)+1);
17991697 strcpy(tempname,filename);
18001698 pt = strrchr(tempname,'/');
@@ -1808,11 +1706,7 @@
18081706 pt = strrchr(filename,'.');
18091707 if ( pt==NULL || pt<strrchr(filename,'/'))
18101708 pt = filename+strlen(filename)+1;
1811-#if __Mac
1812- strcpy(pt-1,".fam");
1813-#else
18141709 strcpy(pt-1,".fam.bin");
1815-#endif
18161710 }
18171711 if ( WriteMacPSFont(tempname,sfi->sf,format,flags,sfi->map,layer)==0 )
18181712 return( 0 );
@@ -1834,11 +1728,7 @@
18341728 }
18351729 }
18361730
1837- if ( __Mac && (format==ff_ttfmacbin || format==ff_pfbmacbin ||
1838- (format==ff_none && bf==bf_nfntmacbin)))
1839- res = tmpfile();
1840- else
1841- res = fopen(filename,"wb+");
1731+ res = fopen(filename,"wb+");
18421732 if ( res==NULL ) {
18431733 for ( sfsub=sfs; sfsub!=NULL; sfsub=sfsub->next )
18441734 fclose( sfsub->tempttf );
@@ -2899,40 +2789,7 @@
28992789 return( (SplineFont *) -1 ); /* It's a valid resource file, but just has no fonts */
29002790 }
29012791
2902-#if __Mac
2903-static SplineFont *HasResourceFork(char *filename,int flags,enum openflags openflags,
2904- SplineFont *into,EncMap *map) {
2905- /* If we're on a mac, we can try to see if we've got a real resource fork */
2906- /* (if we do, copy it into a temporary data file and then manipulate that)*/
2907- SplineFont *ret;
2908- FILE *resfork;
2909- char *tempfn=filename, *pt, *lparen, *respath;
29102792
2911- if (( pt=strrchr(filename,'/'))==NULL ) pt = filename;
2912- if ( (lparen = strchr(pt,'('))!=NULL && strchr(lparen,')')!=NULL ) {
2913- tempfn = copy(filename);
2914- tempfn[lparen-filename] = '\0';
2915- }
2916- respath = malloc(strlen(tempfn)+strlen("/..namedfork/rsrc")+1);
2917- strcpy(respath,tempfn);
2918- strcat(respath,"/..namedfork/rsrc");
2919- resfork = fopen(respath,"r");
2920- if ( resfork==NULL ) {
2921- strcpy(respath,tempfn);
2922- strcat(respath,"/rsrc");
2923- resfork = fopen(respath,"r");
2924- }
2925- free(respath);
2926- if ( tempfn!=filename )
2927- free(tempfn);
2928- if ( resfork==NULL )
2929-return( NULL );
2930- ret = IsResourceFork(resfork,0,filename,flags,openflags,into,map);
2931- fclose(resfork);
2932-return( ret );
2933-}
2934-#endif
2935-
29362793 static SplineFont *IsResourceInBinary(FILE *f,char *filename,int flags,
29372794 enum openflags openflags, SplineFont *into,EncMap *map) {
29382795 unsigned char header[128];
@@ -3102,10 +2959,6 @@
31022959
31032960 sf = IsResourceFork(f,0,filename,flags,openflags,into,map);
31042961 fclose(f);
3105-#if __Mac
3106- if ( sf==NULL )
3107- sf = HasResourceFork(filename,flags,openflags,into,map);
3108-#endif
31092962 return( sf );
31102963 }
31112964
--- trunk/fontanvil/fontanvil/cvundoes.c (revision 502)
+++ trunk/fontanvil/fontanvil/cvundoes.c (revision 503)
@@ -36,7 +36,7 @@
3636 #else
3737 #include <execinfo.h>
3838 #endif
39-#include "collabclient.h"
39+/* #include "collabclient.h" */
4040
4141 extern char *coord_sep;
4242
@@ -591,7 +591,7 @@
591591
592592 /* Let collab system know that a new undo state */
593593 /* was pushed now since it last sent a message. */
594- collabclient_CVPreserveStateCalled( cv );
594+/* collabclient_CVPreserveStateCalled( cv ); */
595595 return( ret );
596596 }
597597
@@ -733,7 +733,7 @@
733733 SCPreserveLayer(sc,i,false);
734734
735735 Undoes* ret = SCPreserveLayer( sc, ly_fore, dohints );
736- collabclient_SCPreserveStateCalled( sc );
736+/* collabclient_SCPreserveStateCalled( sc ); */
737737 return( ret );
738738 }
739739
@@ -846,7 +846,7 @@
846846
847847 /* Let collab system know that a new undo state */
848848 /* was pushed now since it last sent a message. */
849- collabclient_SCPreserveStateCalled( sc );
849+/* collabclient_SCPreserveStateCalled( sc ); */
850850 return(ret);
851851 }
852852
@@ -1006,9 +1006,9 @@
10061006 undo->next = cv->layerheads[cv->drawmode]->redoes;
10071007 cv->layerheads[cv->drawmode]->redoes = undo;
10081008
1009- if ( !collabclient_generatingUndoForWire(cv) ) {
1009+/* if ( !collabclient_generatingUndoForWire(cv) ) {
10101010 _CVCharChangedUpdate(cv,undo->was_modified);
1011- }
1011+ } */
10121012 }
10131013
10141014 void CVDoRedo(CharViewBase *cv) {
--- trunk/fontanvil/fontanvil/cvexport.c (revision 502)
+++ trunk/fontanvil/fontanvil/cvexport.c (revision 503)
@@ -32,7 +32,6 @@
3232 #include <time.h>
3333 #include "ustring.h"
3434 #include "gio.h"
35-#include "gicons.h"
3635 #include "print.h" /* For pdf output routines */
3736 #include <utype.h>
3837
--- trunk/fontanvil/Unicode/ustring.c (revision 502)
+++ trunk/fontanvil/Unicode/ustring.c (revision 503)
@@ -483,9 +483,9 @@
483483 }
484484
485485 char *u_to_c(const unichar_t *ubuf) {
486+ static char buf[400];
486487 if( !ubuf )
487488 return 0;
488- static char buf[400];
489489 cu_strncpy(buf,ubuf,sizeof(buf));
490490 return( buf );
491491 }
--- trunk/fontanvil/gutils/giomime.c (revision 502)
+++ trunk/fontanvil/gutils/giomime.c (revision 503)
@@ -68,43 +68,8 @@
6868 //unichar_t fontwoff[] = { 'a','p','p','l','i','c','a','t','i','o','n','/','x','-','f','o','n','t','-','w','o','f','f', '\0' };
6969 //unichar_t fonttexfm[] = { 'a','p','p','l','i','c','a','t','i','o','n','/','x','-','t','e','x','-','t','f','m', '\0' }; /* *.tfm */
7070
71-#ifdef __Mac
72-#include <carbon.h>
73-#define CHR(ch1,ch2,ch3,ch4) (((ch1)<<24)|((ch2)<<16)|((ch3)<<8)|(ch4))
7471
75-static unichar_t *_GioMacMime(const char *path) {
76- /* If we're on a mac, we can try to see if we've got a real resource fork */
77- FSRef ref;
78- FSCatalogInfo info;
79-
80- if ( FSPathMakeRef( (uint8 *) path,&ref,NULL)!=noErr )
81-return( NULL );
82- if ( FSGetCatalogInfo(&ref,kFSCatInfoFinderInfo,&info,NULL,NULL,NULL)!=noErr )
83-return( NULL );
84- if ( ((FInfo *) (info.finderInfo))->fdType==CHR('F','F','I','L') )
85-return( fontmacsuit );
86- if ( ((FInfo *) (info.finderInfo))->fdType==CHR('G','I','F','f') )
87-return( imagegif );
88- if ( ((FInfo *) (info.finderInfo))->fdType==CHR('P','N','G',' ') )
89-return( imagepng );
9072 /*
91- if ( ((FInfo *) (info.finderInfo))->fdType==CHR('B','M','P',' ') )
92-return( imagebmp );
93-*/
94- if ( ((FInfo *) (info.finderInfo))->fdType==CHR('J','P','E','G') )
95-return( imagejpeg );
96-/*
97- if ( ((FInfo *) (info.finderInfo))->fdType==CHR('T','I','F','F') )
98-return( imagetiff );
99-*/
100- if ( ((FInfo *) (info.finderInfo))->fdType==CHR('T','E','X','T') )
101-return( textplain );
102-
103-return( NULL );
104-}
105-#endif
106-
107-/*
10873 * Unused
10974 static unichar_t *GIOguessMimeType(const unichar_t *path,int isdir) {
11075 unichar_t *pt;
--- trunk/fontanvil/Makefile.am (revision 502)
+++ trunk/fontanvil/Makefile.am (revision 503)
@@ -126,11 +126,10 @@
126126
127127 noinst_HEADERS = \
128128 inc/basics.h inc/chardata.h inc/charset.h inc/dynamic.h inc/fileutil.h \
129- inc/fontanvil-config.h inc/gdraw.h inc/gfile.h inc/ggadget.h inc/gicons.h \
130- inc/gimage.h inc/gio.h inc/gprogress.h inc/gresedit.h \
129+ inc/fontanvil-config.h inc/gdraw.h inc/gfile.h inc/ggadget.h \
130+ inc/gimage.h inc/gio.h inc/gprogress.h \
131131 inc/gresource.h inc/gwidget.h inc/gwwiconv.h inc/intl.h inc/ustring.h \
132- inc/utype.h inc/dlist.h inc/carbon.h inc/gnetwork.h inc/gutils.h \
133- inc/pluginloading.h \
132+ inc/utype.h inc/dlist.h inc/gnetwork.h inc/gutils.h \
134133 fontanvil/fontanvilui.h fontanvil/sftextfieldP.h \
135134 fontanvil/configure-fontanvil.h fontanvil/views.h fontanvil/is_LIGATURE.h \
136135 fontanvil/flaglist.h fontanvil/strlist.h fontanvil/charview_private.h \
@@ -158,8 +157,7 @@
158157 fontanvil/asmfpst.c fontanvil/autohint.c fontanvil/autosave.c \
159158 fontanvil/autotrace.c fontanvil/autowidth.c fontanvil/autowidth2.c \
160159 fontanvil/bezctx_ff.c fontanvil/bitmapchar.c fontanvil/bitmapcontrol.c \
161- fontanvil/bvedit.c fontanvil/collabclient.c fontanvil/collabclient.h \
162- fontanvil/collabclientpriv.h fontanvil/clipnoui.c fontanvil/crctab.c \
160+ fontanvil/bvedit.c fontanvil/clipnoui.c fontanvil/crctab.c \
163161 fontanvil/cvexport.c fontanvil/cvimages.c fontanvil/cvundoes.c \
164162 fontanvil/dumpbdf.c fontanvil/dumppfa.c fontanvil/effects.c \
165163 fontanvil/encoding.c fontanvil/featurefile.c fontanvil/flaglist.c \
--- trunk/fontanvil/inc/carbon.h (revision 502)
+++ trunk/fontanvil/inc/carbon.h (nonexistent)
@@ -1,20 +0,0 @@
1-#ifdef __Mac
2-
3-#ifdef __GNUC_STDC_INLINE__
4-#undef __GNUC_STDC_INLINE__
5-#endif
6-
7-#define AnchorPoint MacAnchorPoint
8-#define FontInfo MacFontInfo
9-#define KernPair MacKernPair
10-
11-#include <Carbon/Carbon.h>
12-
13-#undef FontInfo
14-#undef KernPair
15-#undef AnchorPoint
16-
17-
18-
19-#endif /* __Mac */
20-
--- trunk/fontanvil/inc/gresedit.h (revision 502)
+++ trunk/fontanvil/inc/gresedit.h (nonexistent)
@@ -1,103 +0,0 @@
1-/* Copyright (C) 2000-2012 by George Williams */
2-/*
3- * Redistribution and use in source and binary forms, with or without
4- * modification, are permitted provided that the following conditions are met:
5-
6- * Redistributions of source code must retain the above copyright notice, this
7- * list of conditions and the following disclaimer.
8-
9- * Redistributions in binary form must reproduce the above copyright notice,
10- * this list of conditions and the following disclaimer in the documentation
11- * and/or other materials provided with the distribution.
12-
13- * The name of the author may not be used to endorse or promote products
14- * derived from this software without specific prior written permission.
15-
16- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26- */
27-#ifndef _GRESEDIT_H
28-#define _GRESEDIT_H
29-
30-#include <basics.h>
31-#include <gresource.h>
32-#include <ggadget.h>
33-
34-enum res_type2 { rt_stringlong = rt_string+1, rt_coloralpha, rt_image, rt_font };
35-
36-struct resed {
37- char *name, *resname;
38- enum res_type type;
39- void *val;
40- char *popup;
41- void *(*cvt)(char *,void *);
42- union { int ival; double dval; char *sval; GFont *fontval; } orig;
43- int cid;
44- int found;
45-};
46-
47-#define RESED_EMPTY { NULL, NULL, 0, NULL, NULL, NULL, { 0 }, 0, 0 }
48-
49-
50-typedef struct gresinfo {
51- struct gresinfo *next;
52- struct gresinfo *inherits_from;
53- struct gresinfo *seealso1, *seealso2;
54- GBox *boxdata;
55- GFont **font;
56- GGadgetCreateData *examples;
57- struct resed *extras;
58- char *name;
59- char *initialcomment;
60- char *resname;
61- char *progname;
62- uint8 is_button; /* Activate default button border flag */
63- uint32 override_mask;
64- GBox *overrides;
65- GBox orig_state;
66- void (*refresh)(void); /* Called when user OKs the resource editor dlg */
67- void *reserved_for_future_use1;
68- void *reserved_for_future_use2;
69-} GResInfo;
70-
71-enum override_mask_flags {
72- /* First 8 flags are the enum box_flags */
73- omf_border_type = 0x100,
74- omf_border_shape = 0x200,
75- omf_border_width = 0x400,
76- omf_padding = 0x800,
77- omf_rr_radius = 0x1000,
78-
79- omf_refresh = 0x2000, /* Not a real override flag. A hack */
80- /* I use it to indicate that the refresh field*/
81- /* is meaningful. That field didn't exist in */
82- /* old versions of the library, adding this */
83- /* mask means we don't need to break binary */
84- /* compatibility */
85-
86- omf_main_foreground = 0x10000,
87- omf_disabled_foreground = 0x20000,
88- omf_main_background = 0x40000,
89- omf_disabled_background = 0x80000,
90- omf_depressed_background = 0x100000,
91- omf_gradient_bg_end = 0x200000,
92- omf_border_brightest = 0x400000,
93- omf_border_brighter = 0x800000,
94- omf_border_darkest = 0x1000000,
95- omf_border_darker = 0x2000000,
96- omf_active_border = 0x4000000,
97-
98- omf_font = 0x80000000
99-};
100-
101-extern void GResEdit(GResInfo *additional,const char *def_res_file,void (*change_res_filename)(const char *));
102-extern void GResEditFind( struct resed *resed, char *prefix);
103-#endif /* _GRESEDIT_H */
--- trunk/fontanvil/inc/pluginloading.h (revision 502)
+++ trunk/fontanvil/inc/pluginloading.h (nonexistent)
@@ -1,37 +0,0 @@
1-/* Copyright (C) 2000-2012 by George Williams */
2-/*
3- * Redistribution and use in source and binary forms, with or without
4- * modification, are permitted provided that the following conditions are met:
5-
6- * Redistributions of source code must retain the above copyright notice, this
7- * list of conditions and the following disclaimer.
8-
9- * Redistributions in binary form must reproduce the above copyright notice,
10- * this list of conditions and the following disclaimer in the documentation
11- * and/or other materials provided with the distribution.
12-
13- * The name of the author may not be used to endorse or promote products
14- * derived from this software without specific prior written permission.
15-
16- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26- */
27-
28-#ifndef _PLUGIN_LOADING_H
29-#define _PLUGIN_LOADING_H
30-
31-#include <ltdl.h>
32-
33-void init_plugins(void);
34-int plugins_are_initialized(void);
35-lt_dlhandle load_plugin(const char *dynamic_lib_name, void (*logger)(const char *fmt,...));
36-
37-#endif /* _PLUGIN_LOADING_H */
--- trunk/fontanvil/inc/gicons.h (revision 502)
+++ trunk/fontanvil/inc/gicons.h (nonexistent)
@@ -1,60 +0,0 @@
1-/* Copyright (C) 2000-2012 by George Williams */
2-/*
3- * Redistribution and use in source and binary forms, with or without
4- * modification, are permitted provided that the following conditions are met:
5-
6- * Redistributions of source code must retain the above copyright notice, this
7- * list of conditions and the following disclaimer.
8-
9- * Redistributions in binary form must reproduce the above copyright notice,
10- * this list of conditions and the following disclaimer in the documentation
11- * and/or other materials provided with the distribution.
12-
13- * The name of the author may not be used to endorse or promote products
14- * derived from this software without specific prior written permission.
15-
16- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26- */
27-extern GImage _GIcon_unknown;
28-extern GImage _GIcon_object;
29-extern GImage _GIcon_updir;
30-extern GImage _GIcon_dir;
31-extern GImage _GIcon_core;
32-extern GImage _GIcon_image;
33-extern GImage _GIcon_video;
34-extern GImage _GIcon_audio;
35-extern GImage _GIcon_texthtml;
36-extern GImage _GIcon_textxml;
37-extern GImage _GIcon_textjava;
38-extern GImage _GIcon_textcss;
39-extern GImage _GIcon_textplain;
40-extern GImage _GIcon_textc;
41-extern GImage _GIcon_textmake;
42-extern GImage _GIcon_textfontbdf;
43-extern GImage _GIcon_textfontps;
44-extern GImage _GIcon_textfontsfd;
45-extern GImage _GIcon_textps;
46-extern GImage _GIcon_ttf;
47-extern GImage _GIcon_cid;
48-extern GImage _GIcon_mac;
49-extern GImage _GIcon_macttf;
50-extern GImage _GIcon_compressed;
51-extern GImage _GIcon_tar;
52-extern GImage _GIcon_homefolder;
53-extern GImage _GIcon_configtool;
54-extern GImage _GIcon_bookmark;
55-extern GImage _GIcon_nobookmark;
56-extern GImage _GIcon_nobookmark;
57-extern GImage _GIcon_backarrow;
58-extern GImage _GIcon_forwardarrow;
59-
60-extern void InitChooserIcons(void);
Show on old repository browser