annotate netinstall/netio.cc @ 872:79c6ff3eef26

[xemacs-hg @ 2002-06-20 21:18:01 by ben] font changes etc.; some 21.4 changes mule/mule-msw-init-late.el: Specify charset->windows-registry conversion. mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c. cl-macs.el: Document better. font-lock.el: Move Lisp function regexp to lisp-mode.el. lisp-mode.el: Various indentation fixes: Handle flet functions better. Handle argument lists in defuns and flets. Handle quoted lists, e.g. property lists -- don't indent like function calls. Distinguish between lambdas and other lists. lisp-mode.el: Handle this form. faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code: -- Fix lots of bogus code in msw-faces.el, msw-font-menu.el, font-menu.el that was "truenaming" font specs -- i.e. in the process of frobbing a particular field in a general user-specified font spec with wildcarded fields, sticking in particular values for all the remaining wildcarded fields. This bug was rampant everywhere except in x-faces.el (the oldest and only correctly written code). This also means that we need to work with font names at all times and not font instances, because a font instance is essentially a truenamed font. -- Total rewrite of extremely junky code in msw-faces.el. Work with names as well as font instances, and return names; stop truenaming when canonicalizing and frobbing; fix handling of the combined style field, i.e. weight/slant (also fixed in font.el). -- Totally rewrite the frobbing functions in faces.el. This time, we frob all the instantiators rather than just computing a single instance value and working backwards. That way, e.g., `bold' will work for all charsets that have bold available, rather than only for whatever charset was part of the computed font instance (another example of the truename virus). Also fix up code to look at the fallbacks (all of them) when no global value present, so we don't need to put something in the global value. Intelligently handle a request to frob a buffer locale, rather than signalling an error. When frobbing instantiators, try hard to figure out what device type is associated with them, and frob each according to its own proper device type. Correctly handle inheritance vectors given as instantiators. Preserve existing tags when putting back frobbed instantiators. Extract out general specifier-frobbing code into specifier.el. Document everything cleanly. Do lots of other things better, etc. -- Don't duplicatively set a global specification for the default font -- it's already in the fallback and we no longer need a default global specification present. Delete various code in x-faces.el and msw-faces.el that duplicated the lists of fonts in faces.c. -- init-global-faces was not being called at all under MS Windows! Major bogosity. That caused device-specific values to get stuck into all the fonts, making it very hard to change them -- setting global specs caused nothing to happen. -- Correct weight names in font.el. -- Lots more font fixups in objects*.c. Printer.el: Warning fix. specifier.el: Add more args to map-specifier. Add various "heuristic" specifier functions to aid in creation of specifier-munging code such as in faces.el. subr.el: New functions. lwlib.c: Fix warning. config.inc.samp: Clean up, add args to control fastcall (not yet supported! the changes needed are in another ws of mine), profile support, vc6 support, union-type. xemacs.dsp, xemacs.mak: Semi-major overhaul. Fix bug where dump-id was always getting recomputed, forcing a redump even when nothing changed. Add support for fastcall. Support edit-and-continue (on by default) with vc6. Use incremental linking when doing a debug compilation. Add support for profiling. Consolidate the various debug flags. Partial support for "batch-compiling" -- compiling many files on a single invocation of the compiler. Doesn't seem to help that much for me, so it's not finished or enabled by default. Remove HAVE_MSW_C_DIRED, we always do. Correct some sloppy use of directories. s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine HAVE_MMAP). s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32 variants (Cygwin, native, MinGW). Both of these are properly used in another ws. alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made: (1) Separation of various header files into an external and an internal version, similar to the existing separation of process.h and procimpl.h. Eventually this should be done for all Lisp objects. The external version has the same name as currently; the internal adds -impl. The external file has XFOO() macros for objects, but the structure is opaque and defined only in the internal file. It's now reasonable to move all prototypes in lisp.h into the appropriate external file, and this should be done. Currently, separation has been done on extents.h, objects*.h, console.h, device.h, frame.h, and window.h. For c/d/f/w, the most basic properties are available in the external header file, with the macros resolving to functions. In the internal header file, the macros are redefined to directly access the structure. Also, the global MARK_FOO_CHANGED macros have been made into functions so that they can be accessed without needing to include lots of -impl headers -- they are used in almost exclusively in non-time-critical functions, and take up enough time that the function overhead will be negligible. Similarly, the function overhead from making the basic properties mentioned above into functions is negligible, and code that does heavy accessing of c/d/f/w structures inevitably ends up needing the internal header files, anyway. (2) More face changes. -- Major rewrite of objects-msw.c. Now handles wildcard specs properly, rather than "truenaming" (or even worse, signalling an error, which previously happened with some of the fallbacks if you tried to use them in make-font-instance!). -- Split charset matching of fonts into two stages -- one to find a font specifically designed for a particular charset (by examining its registry), the second to find a Unicode font that can support the charset. This needs to proceed as two complete, separate instantiations in order to work properly (otherwise many of the fonts in the HELLO page look wrong). This should also make it easy to support iso10646 (Unicode) fonts under X. -- All default values for fonts are now completely specified in the fallbacks. Stuff from mule-x-init.el has all been moved here, merged with the existing specs, and totally rethought so you get sensible results. (HELLO now looks much better!). -- Generalize the "default X/GTK device" stuff into a per-device-type "default device". -- Add mswindows-{set-}charset-registry. In time, charset<->code-page conversion functions will be removed. -- Wrap protective code around calls to compute device specifier tags, and do this computation before calling the face initialization code because the latter may need these tags to be correctly updated. (3) Other changes. EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes. config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of #ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside! eval.c: Let detailed backtraces be detailed. specifier.c: Don't override user's print-string-length/print-length settings. glyphs.c: New function image-instance-instantiator. config.h.in, sysdep.c: Changes for fastcall. sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP NEEDS TO GO IN, TOO. search.c: Fix *evil* crash due to incorrect synching of syntax-cache code with 21.1. THIS SHOULD GO INTO 21.4.
author ben
date Thu, 20 Jun 2002 21:19:10 +0000
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* The purpose of this file is to coordinate the various access
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 methods known to setup. To add a new method, create a pair of
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18 nio-*.[ch] files and add the logic to NetIO::open here */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdio.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #include <string.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 #include "resource.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 #include "state.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 #include "msg.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 #include "netio.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 #include "nio-file.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 #include "nio-ie5.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 #include "nio-http.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 #include "nio-ftp.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 #include "dialog.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 #include "log.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 #include "port.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 NetIO::NetIO (char *Purl)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 set_url (Purl);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 NetIO::~NetIO ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 if (url)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 free (url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 if (proto)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 free (proto);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 if (host)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 free (host);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 if (path)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 free (path);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 NetIO::set_url (char *Purl)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 char *bp, *ep, c;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 file_size = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 url = _strdup (Purl);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 proto = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 host = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 port = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 path = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 bp = url;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 ep = strstr (bp, "://");
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 if (!ep)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 path = url;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 *ep = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 proto = _strdup (bp);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 *ep = ':';
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78 bp = ep+3;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 ep = bp + strcspn (bp, ":/");
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 c = *ep;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 *ep = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 host = _strdup (bp);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 *ep = c;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86 if (*ep == ':')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 port = atoi (ep+1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89 ep = strchr (ep, '/');
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 if (*ep)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 path = _strdup (ep);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
96 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
97 NetIO::ok ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
98 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
99 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
100 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
101
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
102 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
103 NetIO::read (char *buf, int nbytes)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
104 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
105 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
106 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
107
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
108 NetIO *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
109 NetIO::open (char *url)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
110 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
111 NetIO *rv = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
112 enum {http, ftp, file} proto;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
113 if (strncmp (url, "http://", 7) == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
114 proto = http;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
115 else if (strncmp (url, "ftp://", 6) == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
116 proto = ftp;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
117 else
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
118 proto = file;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
119
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
120 if (proto == file)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
121 rv = new NetIO_File (url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
122 else if (net_method == IDC_NET_IE5)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
123 rv = new NetIO_IE5 (url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
124 else if (net_method == IDC_NET_PROXY)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
125 rv = new NetIO_HTTP (url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
126 else if (net_method == IDC_NET_DIRECT)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
127 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
128 switch (proto)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
129 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
130 case http:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
131 rv = new NetIO_HTTP (url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
132 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
133 case ftp:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
134 rv = new NetIO_FTP (url);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
135 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
136 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
137 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
138
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
139 if (!rv->ok ())
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
140 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
141 delete rv;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
142 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
143 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
144
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
145 return rv;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
146 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
147
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
148
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
149 static char **user, **passwd;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
150 static int loading = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
151
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
152 static void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
153 check_if_enable_ok (HWND h)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
154 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
155 int e = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
156 if (*user && *passwd)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
157 e = 1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
158 EnableWindow (GetDlgItem (h, IDOK), e);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
159 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
160
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
161 static void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
162 load_dialog (HWND h)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
163 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
164 loading = 1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
165 eset (h, IDC_NET_USER, *user);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
166 eset (h, IDC_NET_PASSWD, *passwd);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
167 check_if_enable_ok (h);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
168 loading = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
169 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
170
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
171 static void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
172 save_dialog (HWND h)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
173 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
174 *user = eget (h, IDC_NET_USER, *user);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
175 *passwd = eget (h, IDC_NET_PASSWD, *passwd);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
176 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
177
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
178 static BOOL
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
179 auth_cmd (HWND h, int id, HWND hwndctl, UINT code)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
180 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
181 switch (id)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
182 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
183
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
184 case IDC_NET_USER:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
185 case IDC_NET_PASSWD:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
186 if (code == EN_CHANGE && !loading)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
187 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
188 save_dialog (h);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
189 check_if_enable_ok (h);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
190 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
191 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
192
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
193 case IDOK:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
194 save_dialog (h);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
195 EndDialog (h, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
196 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
197
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
198 case IDCANCEL:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
199 EndDialog (h, 1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
200 exit_setup (1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
201 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
202 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
203 return FALSE;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
204 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
205
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
206 static BOOL CALLBACK
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
207 auth_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
208 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
209 switch (message)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
210 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
211 case WM_INITDIALOG:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
212 load_dialog (h);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
213 return FALSE;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
214 case WM_COMMAND:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
215 return HANDLE_WM_COMMAND (h, wParam, lParam, auth_cmd);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
216 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
217 return FALSE;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
218 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
219
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
220 static int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
221 auth_common (HINSTANCE h, int id)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
222 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
223 return DialogBox (h, MAKEINTRESOURCE (id), 0, auth_proc);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
224 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
225
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
226 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
227 NetIO::get_auth ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
228 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
229 user = &net_user;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
230 passwd = &net_passwd;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
231 return auth_common (hinstance, IDD_NET_AUTH);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
232 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
233
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
234 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
235 NetIO::get_proxy_auth ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
236 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
237 user = &net_proxy_user;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
238 passwd = &net_proxy_passwd;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
239 return auth_common (hinstance, IDD_PROXY_AUTH);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
240 }