about summary refs log tree commit diff stats
path: root/src/LYForms.c
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2013-10-14 00:13:37 -0400
committerThomas E. Dickey <dickey@invisible-island.net>2013-10-14 00:13:37 -0400
commited46d3cc0121dbce87345bbbb119cd4080c247c7 (patch)
treec34bdd611f309476e5c1c1d7b72bf43236b522fb /src/LYForms.c
parentf1977d62c94d74a72d1c7a4abbbecdec21e3980e (diff)
downloadlynx-snapshots-ed46d3cc0121dbce87345bbbb119cd4080c247c7.tar.gz
snapshot of project "lynx", label v2-8-8dev_16q
Diffstat (limited to 'src/LYForms.c')
-rw-r--r--src/LYForms.c78


1 files changed, 34 insertions, 44 deletions
diff --git a/src/LYForms.c b/src/LYForms.c
index a21436df..6c9e93e4 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYForms.c,v 1.104 2013/10/12 00:03:00 tom Exp $ */
+/* $LynxId: LYForms.c,v 1.110 2013/10/13 18:39:48 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <HTTP.h>
@@ -21,9 +21,9 @@
 #endif
 
 #if defined(VMS) && !defined(USE_SLANG)
-#define CTRL_W_HACK DO_NOTHING
+#define RepaintKey() 12		/* CTRL-L for repaint */
 #else
-#define CTRL_W_HACK 23		/* CTRL-W refresh without clearok */
+#define RepaintKey() ((!enable_scrollback) ? 23 : 12) /* CTRL-W or CTRL-L */
 #endif /* VMS && !USE_SLANG */
 
 static int form_getstr(int cur,
@@ -114,12 +114,7 @@ int change_form_link_ex(int cur,
 				     form->size_l,
 				     FormIsReadonly(form),
 				     FALSE);
-#if CTRL_W_HACK != DO_NOTHING
-	    if (!enable_scrollback)
-		c = CTRL_W_HACK;	/* CTRL-W refresh without clearok */
-	    else
-#endif
-		c = 12;		/* CTRL-L for repaint */
+	    c = RepaintKey();
 	    break;
 	}
 	form->num_value = LYhandlePopupList(form->num_value,
@@ -148,12 +143,7 @@ int change_form_link_ex(int cur,
 	     */
 	    form->value_cs = opt_ptr->value_cs;
 	}
-#if CTRL_W_HACK != DO_NOTHING
-	if (!enable_scrollback)
-	    c = CTRL_W_HACK;	/* CTRL-W refresh without clearok */
-	else
-#endif
-	    c = 12;		/* CTRL-L for repaint */
+	c = RepaintKey();
 	break;
 
     case F_RADIO_TYPE:
@@ -383,7 +373,7 @@ static int form_getstr(int cur,
     BOOL refresh_mb = TRUE;
 #endif
 
-    EditFieldData MyEdit, *edit = &MyEdit;
+    FieldEditor MyEdit, *edit = &MyEdit;
     BOOLEAN Edited = FALSE;	/* Value might be updated? */
 
     /*
@@ -424,26 +414,26 @@ static int form_getstr(int cur,
      * Print panned line
      */
     LYSetupEdit(edit, link_value, form->maxlength, (far_col - startcol));
-    edit->pad = '_';
-    edit->hidden = (BOOL) (form->type == F_PASSWORD_TYPE);
+    edit->efPadChar = '_';
+    edit->efIsMasked = (BOOL) (form->type == F_PASSWORD_TYPE);
     if (use_last_tfpos &&
 	LastTFPos >= 0 &&
-	LastTFPos < (int) edit->buffer_used) {
+	LastTFPos < (int) edit->efBufInUse) {
 #if defined(TEXTFIELDS_MAY_NEED_ACTIVATION) && defined(INACTIVE_INPUT_STYLE_VH)
 	if (redraw_only) {
-	    if (!(edit->buffer_used >= edit->dspwdth &&
-		  LastTFPos >= edit->dspwdth - edit->margin)) {
-		edit->pos = LastTFPos;
-		if (edit->buffer_used >= edit->dspwdth)
+	    if (!(edit->efBufInUse >= edit->efWide &&
+		  LastTFPos >= edit->efWide - edit->efPanMargin)) {
+		edit->efEditAt = LastTFPos;
+		if (edit->efBufInUse >= edit->efWide)
 		    textinput_redrawn = FALSE;
 	    }
 	} else
 #endif /* TEXTFIELDS_MAY_NEED_ACTIVATION && INACTIVE_INPUT_STYLE_VH */
-	    edit->pos = LastTFPos;
+	    edit->efEditAt = LastTFPos;
 #ifdef ENHANCED_LINEEDIT
-	if (edit->pos == 0)
+	if (edit->efEditAt == 0)
 	    /* Do not show the region. */
-	    edit->mark = -(int) (1 + edit->buffer_used);
+	    edit->efEditMark = -(int) (1 + edit->efBufInUse);
 #endif
     }
     /* Try to prepare for setting position based on the last mouse event */
@@ -451,7 +441,7 @@ static int form_getstr(int cur,
     if (!redraw_only) {
 	if (peek_mouse_levent()) {
 	    if (!use_last_tfpos && !textinput_redrawn) {
-		edit->pos = 0;
+		edit->efEditAt = 0;
 	    }
 	}
 	textinput_redrawn = FALSE;
@@ -459,7 +449,7 @@ static int form_getstr(int cur,
 #else
     if (peek_mouse_levent()) {
 	if (!use_last_tfpos)
-	    edit->pos = 0;
+	    edit->efEditAt = 0;
     }
 #endif /* TEXTFIELDS_MAY_NEED_ACTIVATION && INACTIVE_INPUT_STYLE_VH */
     LYRefreshEdit(edit);
@@ -537,7 +527,7 @@ static int form_getstr(int cur,
 		 * within a mouse menu.  Let's at least make sure here that the
 		 * cursor position gets restored.  - kw
 		 */
-		edit->dirty = TRUE;
+		edit->efIsDirty = TRUE;
 	    }
 	} else
 #  endif /* NCURSES || PDCURSES */
@@ -545,8 +535,8 @@ static int form_getstr(int cur,
 
 	{
 	    if (!(ch & LKC_ISLECLAC))
-		ch |= edit->current_modifiers;
-	    edit->current_modifiers = 0;
+		ch |= edit->efInputMods;
+	    edit->efInputMods = 0;
 	    if (last_xlkc != -1) {
 		if (ch == last_xlkc)
 		    ch |= LKC_MOD3;
@@ -568,14 +558,14 @@ static int form_getstr(int cur,
 	    /*
 	     * Set flag for modifier 1.
 	     */
-	    edit->current_modifiers |= LKC_MOD1;
+	    edit->efInputMods |= LKC_MOD1;
 	    continue;
 	}
 	if (action == LYE_SETM2) {
 	    /*
 	     * Set flag for modifier 2.
 	     */
-	    edit->current_modifiers |= LKC_MOD2;
+	    edit->efInputMods |= LKC_MOD2;
 	    continue;
 	}
 	/*
@@ -637,7 +627,7 @@ static int form_getstr(int cur,
 		    StrAllocCopy(buf, (char *) e1 + 1);		/* Survive _release() */
 		get_clip_release();
 		_statusline(ENTER_TEXT_ARROWS_OR_TAB);
-		if (strcmp(link_value, edit->buffer) != 0) {
+		if (strcmp(link_value, edit->efBuffer) != 0) {
 		    Edited = TRUE;
 		}
 		if (buf) {
@@ -678,9 +668,9 @@ static int form_getstr(int cur,
 	    break;
 #else
 #ifdef ENHANCED_LINEEDIT
-	    if (edit->mark >= 0)
+	    if (edit->efEditMark >= 0)
 		/* Disable. */
-		edit->mark = -(int) (1 + edit->buffer_used);
+		edit->efEditMark = -(int) (1 + edit->efBufInUse);
 #endif
 #endif
 	}
@@ -699,12 +689,12 @@ static int form_getstr(int cur,
 	     * Left arrow in column 0 deserves special treatment here, else
 	     * you can get trapped in a form without submit button!
 	     */
-	    if (action == LYE_BACK && edit->pos == 0 && repeat == -1) {
+	    if (action == LYE_BACK && edit->efEditAt == 0 && repeat == -1) {
 		int c = YES;	/* Go back immediately if no changes */
 
 		if (textfield_prompt_at_left_edge) {
 		    c = HTConfirmDefault(PREV_DOC_QUERY, NO);
-		} else if (strcmp(edit->buffer, link_value)) {
+		} else if (strcmp(edit->efBuffer, link_value)) {
 		    c = HTConfirmDefault(PREV_DOC_QUERY, NO);
 		}
 		if (c == YES) {
@@ -753,7 +743,7 @@ static int form_getstr(int cur,
 	    if (repeat < 0)
 		repeat = 1;
 	    while (repeat--) {
-		int rc = LYEdit1(edit, ch, action & ~LYE_DF, TRUE);
+		int rc = LYDoEdit(edit, ch, action & ~LYE_DF, TRUE);
 
 		if (rc < 0) {
 		    ch = -rc;
@@ -794,20 +784,20 @@ static int form_getstr(int cur,
 			refresh_mb = TRUE;
 		} else {
 		    if (!refresh_mb) {
-			LYEdit1(edit, 0, LYE_DELP, TRUE);
+			LYDoEdit(edit, 0, LYE_DELP, TRUE);
 		    }
 		}
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 	    }
 	    _statusline(ENTER_TEXT_ARROWS_OR_TAB);
-	    if (strcmp(link_value, edit->buffer)) {
+	    if (strcmp(link_value, edit->efBuffer)) {
 		Edited = TRUE;
 	    }
 #ifdef SUPPORT_MULTIBYTE_EDIT
 	    if (refresh_mb)
 #endif
 		LYRefreshEdit(edit);
-	    LYSetLastTFPos(edit->pos);
+	    LYSetLastTFPos(edit->efEditAt);
 	}
     }
   breakfor:
@@ -821,7 +811,7 @@ static int form_getstr(int cur,
 	     * The previous value did fit in the line buffer, so replace it
 	     * with the new value.  - FM
 	     */
-	    StrAllocCopy(form->value, edit->buffer);
+	    StrAllocCopy(form->value, edit->efBuffer);
 	} else {
 	    int old_len = (int) strlen(form->value);
 	    int new_len = (int) strlen(link_value);
@@ -830,7 +820,7 @@ static int form_getstr(int cur,
 	     * Combine the modified tail with the unmodified head.  - FM
 	     */
 	    form->value[(old_len > new_len) ? (old_len - new_len) : 0] = '\0';
-	    StrAllocCat(form->value, edit->buffer);
+	    StrAllocCat(form->value, edit->efBuffer);
 	    HTUserMsg(FORM_TAIL_COMBINED_WITH_HEAD);
 	}
 

 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-11 14:50:00 +0000


 


ram <vc@akkartik.com>  2015-02-17 17:14:45 -0800

775 - starting to reorg C++ mu to use layers' href='/akkartik/mu/commit/cpp/literate/000organization?h=main&id=515309164793b2e03c15954bf8a89f0f288a7f2c'>51530916 ^



4ea9905f ^



36f616b5 ^

455f0338 ^

385ff136 ^

455f0338 ^




6573fe1f ^

ec99eb7a ^

51530916 ^



1
2

3
4

5
6
7
8
9
10
11
12
13

14
15

16

17
18

19

20
21
22
23
24

25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70

71

72

73
74
75

76

77

78

79
80
81

82
83
84
85

86
87
88
89

90
91
92
93
94
95
96

97

98
99
100

101
102
103

104

105

106

107
108
109

110

111
112
113

114

115

116

117

118

119
120

121
122
123

124
125
126

127

128

129

130
131
132
133

134

135

136




                                                                            

                                                                        








                                                                               

                                                                              
                            

                                                                        
   




                                                                              













































                                                                                
                    
   


                                                                              
                                                                       
                                                                       
                                                


                                                                      



                                                                             



                                                                             






               
                                                                              


                                                                              


                                                                                        
  
                                                                             
                                                                              


                                                                              
  


                                  
                
 
                       
 
                        

                            


                        


                 
                                                                                
                        
                   



                                                                            
              
              
 
//: You guessed right: the '000' prefix means you should start reading here.
//:
//: This project is set up to load all files with a numeric prefix. Just
//: create a new file and start hacking.
//:
//: The first few files (00*) are independent of what this program does, an
//: experimental skeleton that will hopefully make it both easier for others to
//: understand and more malleable, easier to rewrite and remould into radically
//: different shapes without breaking in subtle corner cases. The premise is
//: that understandability and rewrite-friendliness are related in a virtuous
//: cycle. Doing one well makes it easier to do the other.
//:
//: Lower down, this file contains a legal, bare-bones C++ program. It doesn't
//: do anything yet; subsequent files will contain :(...) directives to insert
//: lines into it. For example:
//:   :(after "more events")
//: This directive means: insert the following lines after a line in the
//: program containing the words "more events".
//:
//: A simple tool is included to 'tangle' all the files together in sequence
//: according to their directives into a single source file containing all the
//: code for the project, and then feed the source file to the compiler.
//: (It'll drop these comments starting with a '//:' prefix that only make
//: sense before tangling.)
//:
//: Directives free up the programmer to order code for others to read rather
//: than as forced by the computer or compiler. Each individual feature can be
//: organized in a self-contained 'layer' that adds code to many different data
//: structures and functions all over the program. The right decomposition into
//: layers will let each layer make sense in isolation.
//:
//:   "If I look at any small part of it, I can see what is going on -- I don't
//:   need to refer to other parts to understand what something is doing.
//:
//:   If I look at any large part in overview, I can see what is going on -- I
//:   don't need to know all the details to get it.
//:
//:   Every level of detail is as locally coherent and as well thought-out as
//:   any other level."
//:
//:       -- Richard Gabriel, "The Quality Without A Name"
//:          (http://dreamsongs.com/Files/PatternsOfSoftware.pdf, page 42)
//:
//: Directives are powerful; they permit inserting or modifying any point in
//: the program. Using them tastefully requires mapping out specific lines as
//: waypoints for future layers to hook into. Often such waypoints will be in
//: comments, capitalized to hint that other layers rely on their presence.
//:
//: A single waypoint might have many different code fragments hooking into
//: it from all over the codebase. Use 'before' directives to insert
//: code at a location in order, top to bottom, and 'after' directives to
//: insert code in reverse order. By convention waypoints intended for insertion
//: before begin with 'End'. Notice below how the layers line up above the "End
//: Foo" waypoint.
//:
//:   File 001          File 002                File 003
//:   ============      ===================     ===================
//:   // Foo
//:   ------------
//:              <----  :(before "End Foo")
//:                     ....
//:                     ...
//:   ------------
//:              <----------------------------  :(before "End Foo")
//:                                             ....
//:                                             ...
//:   // End Foo
//:   ============
//:
//: Here's part of a layer in color: http://i.imgur.com/0eONnyX.png. Directives
//: are shaded dark.
//:
//: Layers do more than just shuffle code around. In a well-organized codebase
//: it should be possible to stop loading after any file/layer, build and run
//: the program, and pass all tests for loaded features. (Relevant is
//: http://youtube.com/watch?v=c8N72t7aScY, a scene from "2001: A Space
//: Odyssey".) Get into the habit of running the included script called
//: 'test_layers' before you commit any changes.
//:
//: This 'subsetting guarantee' ensures that this directory contains a
//: cleaned-up narrative of the evolution of this codebase. Organizing
//: autobiographically allows newcomers to rapidly orient themselves, reading
//: the first few files to understand a simple gestalt of a program's core
//: purpose and features, and later gradually working their way through other
//: features as the need arises.
//:
//: Programmers shouldn't need to understand everything about a program to
//: hack on it. But they shouldn't be prevented from a thorough understanding
//: of each aspect either. The goal of layers is to reward curiosity.

// Includes
// End Includes

// Types
// End Types

// Function prototypes are auto-generated in the 'build*' scripts; define your
// functions in any order. Just be sure to declare each function header all on
// one line, ending with the '{'. Our auto-generation scripts are too minimal
// and simple-minded to handle anything else.
#include "function_list"  // by convention, files ending with '_list' are auto-generated

// Globals
//
// All statements in this section should always define a single variable on a
// single line. The 'build*' scripts will simple-mindedly auto-generate extern
// declarations for them. Remember to define (not just declare) constants with
// extern linkage in this section, since C++ global constants have internal
// linkage by default.
//
// End Globals

int main(int argc, char* argv[]) {
  atexit(reset);

  // End One-time Setup

  // Commandline Parsing
  // End Commandline Parsing

  return 0;  // End Main
}

// Unit Tests
// End Unit Tests

//: our first directive; insert the following header at the start of the program
:(before "End Includes")
#include <stdlib.h>

//: Without directives or with the :(code) directive, lines get added at the
//: end.
:(code)
void reset() {
  // End Reset
}






 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-11 14:50:00 +0000