1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 18:07:59 +00:00
Commit Graph

317 Commits

Author SHA1 Message Date
Simon Tatham
8b57939f6b Update version numbers preparatory to tagging for release.
[originally from svn r3820]
2004-02-07 18:17:50 +00:00
Simon Tatham
2817a7e150 It's a new year.
[originally from svn r3679]
[this svn revision also touched putty-website]
2004-01-01 16:47:55 +00:00
Jacob Nevins
92db92af5a Control of 'addr' is now handed over to {platform_,}new_connection() and
sk_new() on invocation; these functions become responsible for (eventually)
freeing it. The caller must not do anything with 'addr' after it's been passed
in. (Ick.)

Why:
A SOCKS5 crash appears to have been caused by overzealous freeing of
a SockAddr (ssh.c:1.257 [r2492]), which for proxied connections is
squirreled away long-term (and this can't easily be avoided).

It would have been nice to make a copy of the SockAddr, in case the caller has
a use for it, but one of the implementations (uxnet.c) hides a "struct
addrinfo" in there, and we have no defined way to duplicate those. (None of the
current callers _do_ have a further use for the SockAddr.)

As far as I can tell, everything _except_ proxying only needs addr for the
duration of the call, so sk_addr_free()s immediately. If I'm mistaken, it
should at least be easier to find the offending free()...

[originally from svn r3383]
[r2492 == bdd6633970]
2003-08-07 16:04:33 +00:00
Ben Harris
dc2af8af66 Finally, column spanning.
[originally from svn r3184]
2003-05-10 20:51:39 +00:00
Ben Harris
feac9298a0 Change the way that panel-switching works so that we only hide the panel
we're switching from and show the panel we're switching to, rather than
iterating over all the panels, hiding and showing them as appropriate.
This has that consequence that all controls have to be created invisible,
since they no longer get hidden after creation.  As usual, the scroll
bars on list boxes have a special hack of their own.

[originally from svn r3183]
2003-05-10 20:23:23 +00:00
Ben Harris
25ff4e0ed9 I believe that verify_ssh_host_key() should now be passed a real front-end
handle, which removes one of its many flaws.

[originally from svn r3181]
2003-05-10 12:27:38 +00:00
Ben Harris
ccc9ec2bce Update signature of agent_query() to match the rest of the world.
[originally from svn r3178]
2003-05-10 11:40:18 +00:00
Ben Harris
24a1942810 Comment a few things I need to fix.
[originally from svn r3177]
2003-05-10 11:26:33 +00:00
Simon Tatham
6bb121ecb9 Colin's const-fixing Patch Of Death. Seems to build fine on Windows
as well as Unix, so it can go in.

[originally from svn r3162]
2003-05-04 14:18:18 +00:00
Ben Harris
dd055ce280 Missing bits for colour selection support.
[originally from svn r3132]
2003-04-18 13:09:46 +00:00
Ben Harris
338bfcec3c Missing bits for System 7 listbox support.
[originally from svn r3131]
2003-04-18 13:09:08 +00:00
Ben Harris
18bf5c62b7 Remove all those horrid fprintfs.
[originally from svn r3123]
2003-04-14 23:47:07 +00:00
Ben Harris
8f2027fa36 Set the space required by a listbox sensibly as well.
[originally from svn r3122]
2003-04-14 23:28:58 +00:00
Ben Harris
1ecb4a043f Minor fixes:
- Erase the background of System 7 editboxes before drawing them.
 - Set the height of listboxes correctly.
 - Set the panel-selection listbox to 20 items high.

[originally from svn r3121]
2003-04-14 23:25:04 +00:00
Ben Harris
d5a214aa59 Don't call GetColor() if we don't have Color Quickdraw -- no good will come
of it.

[originally from svn r3120]
2003-04-14 22:55:12 +00:00
Ben Harris
bc19e25d71 Support for colour selection in the Mac OS.
[originally from svn r3119]
2003-04-14 22:42:44 +00:00
Ben Harris
2b1305986c Keyboard events in Mac OS 8 list boxes should generate EVENT_SELCHANGE,
not EVENT_VALCHANGE.

[originally from svn r3118]
2003-04-14 21:34:46 +00:00
Ben Harris
ed4551607f Enlarge the settings window so as to fill a 640x480 display. This makes
enough space to actually fit all of the panels.  I'll have to do a version
with smaller fonts for 9" screens.

[originally from svn r3117]
2003-04-14 21:15:39 +00:00
Ben Harris
5d5a16e14c Add a list box to the config dialogue to switch between panels. Now I don't
have to recompile to change panels!

[originally from svn r3116]
2003-04-13 14:37:07 +00:00
Ben Harris
321c6f24c7 Support for list boxes under System 7. There are some horrible kludges in
this code to do with the handling of the scroll bar, but it doesn actually
work better than the Mac OS 8 version.

[originally from svn r3115]
2003-04-13 13:52:44 +00:00
Ben Harris
6db521f4b9 Remove a couple of spurious semicolons.
[originally from svn r3112]
2003-04-12 21:07:25 +00:00
Ben Harris
502d5b4e50 Update for Simon's from_backend changes.
[originally from svn r3111]
2003-04-12 21:06:34 +00:00
Ben Harris
f48a3189fe To avoid gratuitous flicker, if a control already has the focus when it's
clicked in, don't attempt to move the focus at all.

[originally from svn r3073]
2003-04-06 13:27:40 +00:00
Ben Harris
9675063d38 Const fallout, as predicted.
[originally from svn r3071]
2003-04-05 22:12:44 +00:00
Ben Harris
98583ce217 Bring list of applications and architectures up to date.
[originally from svn r3070]
2003-04-05 22:10:13 +00:00
Ben Harris
9117b20d18 dd support for list boxes in Mac OS 8. Not entirely solid, but largely
working.
[ bits missed in the first commit ]

[originally from svn r3069]
2003-04-05 22:03:06 +00:00
Ben Harris
f51cc630c2 Add support for list boxes in Mac OS 8. Not entirely solid, but largely
working.

[originally from svn r3068]
2003-04-05 22:00:57 +00:00
Ben Harris
6de4a868ff On System 7, draw the default ring in grey if the window is disabled.
This isn't _quite_ right, since it uses a b/w dither everywhere, whereas
it should use grey on colour screens.  That would involve mucking around
with DeviceLoop, though, and I'm not sure I can be bothered.

[originally from svn r3066]
2003-04-05 18:00:46 +00:00
Ben Harris
dddcb9ceda Handle Return and Escape keys in dialogue box, triggering the default and
cancel buttons respectively.

[originally from svn r3065]
2003-04-05 17:19:38 +00:00
Ben Harris
f9f5154e76 Cope with NULL labels in every control where it makes sense, and assert that
all other labels are != NULL.

[originally from svn r3061]
2003-04-05 15:55:22 +00:00
Ben Harris
d077cbb088 Send EVENT_VALCHANGE when a System 7 editbox gets typed in.
[originally from svn r3060]
2003-04-05 15:08:17 +00:00
Ben Harris
277ca3a397 Implement dlg_end().
[originally from svn r3059]
2003-04-05 15:01:16 +00:00
Ben Harris
000edf3233 Implement update_special_menu(), which calls mac_adjustmenus() as appropriate.
Eventually, mac_adjustmenus() will handle populating the Specials menu.

[originally from svn r3058]
2003-04-05 14:34:06 +00:00
Ben Harris
87229cbf79 Implement columns, based loosely on Simon's Windows implementation. Now this
actually _looks_ like PuTTY.

[originally from svn r3052]
2003-04-03 23:18:06 +00:00
Simon Tatham
7706da5e17 Various error-handling fixes, mostly in Unix PuTTY but one (failure
to save a session) crosses over into the platform-independent side.

[originally from svn r3041]
2003-04-01 18:10:25 +00:00
Ben Harris
38e6887ad1 Correct the size of editboxes under Mac OS 8.
[originally from svn r3027]
2003-03-30 14:24:20 +00:00
Ben Harris
82502df284 Crude keyboard support for System 7 editboxes.
[originally from svn r3026]
2003-03-30 00:45:00 +00:00
Ben Harris
3ee06b8cc3 The entropy pool is full of unsigned ints, not longs.
[originally from svn r3025]
2003-03-29 23:57:55 +00:00
Ben Harris
f599817d78 Move the Mac port over to using snew/snewn/sresize.
[originally from svn r3024]
2003-03-29 23:07:55 +00:00
Ben Harris
c1c7f5eb49 Convert the System 7 static text control to be a read-only version of the
editbox control.  This means that it has a persistent edit record, can have
its height measured and uses the system font by default, all of which are good.

[originally from svn r3022]
2003-03-29 22:04:21 +00:00
Ben Harris
f0f5932bf8 Add support for labels on editboxes and radios.
[originally from svn r3021]
2003-03-29 20:16:51 +00:00
Ben Harris
54aff83bf0 Add input-focus support for System 7, where the Control Manager can't do
it itself.
Also clean up Carbon builds.

[originally from svn r3019]
2003-03-29 18:32:36 +00:00
Ben Harris
adb469b1c6 Add the System 7 editbox CDEF, which I seem to have forgotten.
[originally from svn r3018]
2003-03-29 18:31:09 +00:00
Ben Harris
6174de9afd Tidy up dlg_editbox_set() and implemen dlg_editbox_get() for System 7.
[originally from svn r3011]
2003-03-28 00:50:04 +00:00
Ben Harris
a263861aaa Display half of a System 7 edit text CDEF, using TextEdit directly. This
is the easy bit.

[originally from svn r3010]
2003-03-28 00:06:17 +00:00
Ben Harris
5c9e56ba3e open_settings_r() and open_settings_w() need to cope with a NULL session name.
[originally from svn r3009]
2003-03-27 22:46:28 +00:00
Ben Harris
9d2b0fb2d8 Get preferred and minimum sizes in the right order.
[originally from svn r3005]
2003-03-26 23:52:21 +00:00
Ben Harris
c8c17d2cef Rename dlg_listbox_addwithindex() to dlg_listbox_addwithid(), since the old
name was, not to put too fine a point on it, wrong.

[originally from svn r2997]
2003-03-25 23:45:56 +00:00
Ben Harris
8cf125c96e Use CountMenuItems() rather than CountMItems() since the latter isn't
available in Carbon.

[originally from svn r2996]
2003-03-25 23:23:03 +00:00
Ben Harris
fe590b2f51 Add support for editbox controls on Mac OS 8, and for per-control private data.
[originally from svn r2995]
2003-03-25 23:18:59 +00:00
Ben Harris
093c88d28a Clean out some #ifdef'ed out junk.
[originally from svn r2985]
2003-03-24 22:46:11 +00:00
Ben Harris
c20818608e Initialise the "next menu ID" counter for pop-up menus. This stops crashes
on Mac OS 8.
Also re-do support for activate events so as not to depend on embedding
hierarchies, and thus to work on System 7.

[originally from svn r2984]
2003-03-24 22:41:38 +00:00
Ben Harris
6991e3ae7d Slightly improve radio button layout to more closely match the Mac OS 8 HI
Guidelines.

[originally from svn r2983]
2003-03-24 21:55:51 +00:00
Ben Harris
335cf4c708 Add support for pop-up menus (drop-down lists in Windows parlance).
For some reason, these explode horribly with the Appearance Manager present,
but work fine in bare System 7.  Investigations are ongoing.

[originally from svn r2980]
2003-03-23 14:11:39 +00:00
Ben Harris
174b839586 Add crude support for multiple panels in the config dialogue box. There's
no way to switch between panels yet, though, so you're stuck on the first one.

[originally from svn r2971]
2003-03-21 00:24:17 +00:00
Ben Harris
ba8c8fec9c Pass a pointer to the entire dialog box structure to event handlers, rather
than just the individual control pointer, because otherwise event handlers
can't modify other controls.

[originally from svn r2970]
2003-03-20 23:15:25 +00:00
Ben Harris
6d95dc84b4 Add support for drawing a ring around the default button in System 7.
[originally from svn r2967]
2003-03-19 00:40:15 +00:00
Ben Harris
ea3dd210de Add support for changing the contents of a pre-Appearance static text control.
[originally from svn r2966]
2003-03-18 23:47:33 +00:00
Ben Harris
471e004558 Tag the "Cancel" button appropriately, in case anyone's using a theme that
pays attention to it.

[originally from svn r2965]
2003-03-18 23:41:14 +00:00
Simon Tatham
4d41247cde Big sprawling dialog-box commit covering all sorts of things.
Buttons now have an `iscancel' flag to go with `isdefault';
dlg_last_focused() now explicitly passes the control it _doesn't_
care about (`I want the last control that had focus and isn't this
one'); and in the GTK implementation, various fixes have happened,
notably including arrow keys working sensibly in list boxes and the
treeview and short font aliases being expanded correctly to
initialise the font selectors.

[originally from svn r2958]
2003-03-18 19:06:51 +00:00
Ben Harris
893ca6173a My First CDEF: A terribly trivial static text control for System 7.
Needs work.

[originally from svn r2955]
2003-03-18 00:35:40 +00:00
Ben Harris
8978c74c45 Insert a missing ampersand that meant that the last version didn't even
compile.

[originally from svn r2954]
2003-03-17 22:38:18 +00:00
Ben Harris
53b61424bc Partial implementation of the platform-independent dialogue-box interface
for the Mac OS.  This isn't anywhere near complete, and is wrong in a few
important regards, but I think it's heading in the right direction.

[originally from svn r2953]
2003-03-17 21:40:37 +00:00
Ben Harris
93198194fb When running on a system with Aqua menu layout, delete the separator line
above "Quit" as well as "Quit" itself.

[originally from svn r2951]
2003-03-17 19:00:36 +00:00
Ben Harris
a816d2df18 Increase PuTTY's default partition size to 2 MB. 1 MB just isn't enough.
[originally from svn r2928]
2003-03-11 22:35:07 +00:00
Ben Harris
43d2fa847f Alert box to support host-key checking.
[originally from svn r2920]
2003-03-06 23:46:06 +00:00
Ben Harris
33e7ee09ab Slightly better than null verify_ssh_host_key(). It's broken in more ways
than I can comfortably enumerate (see the comments in the code), but it's
better than always assuming everything's OK.

[originally from svn r2919]
2003-03-06 23:44:47 +00:00
Ben Harris
614c5a3b92 Improve scheduling on the Mac:
1: Only update the screen when there's nothing else to do.  This means that
it's a lot harder for a fast typist to outrun PuTTY.
2: Only sleep for at most 100ms at a time.  This is a kludge to work around
the WakeUpProcess caused by incoming data can happen before the
WaitNextEvent it's meant to interrupt, leading to PuTTY sleeping forever
because it doesn't know there's network data pending.

[originally from svn r2901]
2003-03-01 15:12:03 +00:00
Ben Harris
000acf446c Handle the Aqua menu layout, in which the system provides a "quit" option
for us, correctly.

[originally from svn r2899]
2003-02-27 23:34:59 +00:00
Ben Harris
b11ffdcd6f Add 'plst' 0 resources to help Mac OS X do magic things.
These aren't actually compiled yet because they must only be present in
the Carbon build, and I don't currently compile the resources separately for
each platform.

[originally from svn r2898]
2003-02-27 23:21:23 +00:00
Ben Harris
d563d6e35b Handle suspend and resume events in PuTTYgen as well.
[originally from svn r2881]
2003-02-23 13:31:12 +00:00
Ben Harris
8bff62d5b8 Don't open the event log whenever an event is logged; instead handle the
"Show Event Log" menu entry sensibly.  Similarly, make it possible to close
(hide) the event log.

[originally from svn r2880]
2003-02-23 13:00:38 +00:00
Ben Harris
791a12ce5b Scroll the event log to the end after adding a line if it was looking at the
end before the line was added.

[originally from svn r2879]
2003-02-23 12:41:44 +00:00
Ben Harris
eec4b9d08d Add handling for suspend and resume events, and set the flags in our 'SIZE'
resource that say we can handle them.  This seems to avoid a crash when PuTTY's
switched away from, and is necessary for Carbon anyway.

[originally from svn r2878]
2003-02-23 11:58:59 +00:00
Ben Harris
01105493cc Work around an SC bug that causes it to try to use the same register for
two purposes in s_wrpkt_prepare().  This makes SSH1 work on 68K Macs, at
least until I deactivate the terminal window...

[originally from svn r2876]
2003-02-23 00:13:17 +00:00
Ben Harris
bd149e7b1e Add a mechanism for collecting entropy, and displaying how much we've got,
based on the Windows version.  We don't _do_ anything with the entropy yet,
though.

[originally from svn r2875]
2003-02-20 22:55:09 +00:00
Ben Harris
f53c998569 Be careful not to try to get information from windows we don't own, or that
don't exist at all.  Also a small PuTTYgen change that I can't be bothered
to filter out of this commit.

[originally from svn r2874]
2003-02-20 22:31:52 +00:00
Ben Harris
eb14a580d7 Make this compile in Carbon.
[originally from svn r2867]
2003-02-19 01:03:47 +00:00
Ben Harris
670289a8b8 Bring PuTTYgen into the world of object-oriented event handling.
Also add a non-functional "generate" button the the key window.

[originally from svn r2857]
2003-02-16 14:27:37 +00:00
Ben Harris
6223099261 Make it possible to close the "about" and "licence" boxes again.
[originally from svn r2856]
2003-02-16 13:44:18 +00:00
Ben Harris
0b0935adf2 Stub code for handling key windows in PuTTYgen. This file will eventually
include all the stuff that does actual work in PuTTYgen.

[originally from svn r2854]
2003-02-16 13:03:12 +00:00
Ben Harris
4f59bac798 Rather than increasing the size of my switch statements yet further, have
a bunch of function pointers associated with each window to do things like
updates and click handling.  This is all looking disturbingly object-oriented.
.
While I'm here, separate out the about box into its own file, shared by PuTTY
and PuTTYgen.

[originally from svn r2850]
2003-02-15 16:22:15 +00:00
Ben Harris
c6a92bebfc Tiny amount of infrastructure for having actual keys in PuTTYgen.
[originally from svn r2849]
2003-02-15 14:20:43 +00:00
Ben Harris
0c1b343646 <OpenTransportInternet.h> seems to want <Files.h>. Silly thing.
[originally from svn r2848]
2003-02-15 14:20:04 +00:00
Ben Harris
ff507407b1 Move the 'vers' resources for Mac OS into their own file, to be shared
by the various applications.

[originally from svn r2843]
2003-02-13 12:30:10 +00:00
Ben Harris
8dcbb16ec2 Minimal shell of PuTTYgen for Mac. No actual PuTTYgen-specific code there
yet, but an absence of PuTTY-specific code.

[originally from svn r2842]
2003-02-12 23:53:15 +00:00
Ben Harris
10bccffd16 Clip host resize requests to the size of the desktop.
[originally from svn r2835]
2003-02-11 23:10:34 +00:00
Ben Harris
bea09a8046 The event log is implemented; remove it from the list.
[originally from svn r2830]
2003-02-10 23:49:58 +00:00
Ben Harris
2c10ece60d Crude Event Log implementation for the Mac. I'm fairly convinced now that
using the List Manager was entirely the wrong decision on my part, so I'll
probably rewrite this to use TextEdit at some point, but it's better than
stderr even so.

[originally from svn r2811]
2003-02-07 01:38:12 +00:00
Ben Harris
60c9d7bae3 Clean up Carbon build procedures somewhat. I still don't have anything that
actually works, but I think I'm getting closer.

[originally from svn r2810]
2003-02-07 01:33:24 +00:00
Ben Harris
f9928fafae Move net_service_lookup() to macnet.c, since that's where it belongs.
[originally from svn r2806]
2003-02-06 01:01:27 +00:00
Ben Harris
a1e2199dc1 Add a level of indirection to make it rather easier to work out which of a
session's windows we're dealing with.

[originally from svn r2804]
2003-02-04 23:39:26 +00:00
Ben Harris
1e25e56378 If we're compiling for Carbon, define OTCARBONAPPLICATION so that we get
the simplified (and backward-compatible) application-only interfaces.

[originally from svn r2793]
2003-02-04 02:15:18 +00:00
Ben Harris
24df1c5463 Carbonise, or at least disable MacTCP support under Carbon.
[originally from svn r2792]
2003-02-04 02:10:42 +00:00
Ben Harris
67312214da I can only quote the comment in <Scrap.h> which prompted this commit:
/*
    Newsflash! After 15 years of arduous toil, it's finally possible
    for specially trained typists wielding advanced text editing
    technology to define symbolic names for commonly used scrap
    flavor type constants! Apple triumphs again!
*/

[originally from svn r2791]
2003-02-04 02:08:03 +00:00
Ben Harris
16f40e8bcc Fix various breakages my Carbonisation caused in the Classic build, notably
that outside Carbon, CGrafPtr and GrafPtr are different types, even though
they're mostly interchangeable, so we need to interpose a cast between
GetWindowPort and SetPort.

[originally from svn r2790]
2003-02-04 02:03:53 +00:00
Ben Harris
13feddf9ea Carbonise. Currently, size tips and copy/paste won't work in Carbon.
[originally from svn r2789]
2003-02-04 01:53:50 +00:00
Ben Harris
45ab39dd19 Slightly improve Carbon handling: we still have to deal with the "About..."
menu entry, even if the rest of the Apple Menu is done for us.

[originally from svn r2788]
2003-02-04 00:33:11 +00:00
Ben Harris
1e67347b04 Convert keyboard events into Unicode properly. I can now type all manner of
interesting characters and have them work properly.

[originally from svn r2787]
2003-02-04 00:01:33 +00:00
Ben Harris
e83c42bb5b Update to match reality.
[originally from svn r2780]
2003-02-02 16:02:50 +00:00