summaryrefslogtreecommitdiff
path: root/app/bin/ctext.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/bin/ctext.c')
-rw-r--r--app/bin/ctext.c105
1 files changed, 56 insertions, 49 deletions
diff --git a/app/bin/ctext.c b/app/bin/ctext.c
index 3ab301c..673e4f7 100644
--- a/app/bin/ctext.c
+++ b/app/bin/ctext.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "cundo.h"
@@ -28,7 +28,8 @@
#include "misc.h"
#include "common-ui.h"
-track_p NewText( wIndex_t index, coOrd p, ANGLE_T angle, char * text, CSIZE_T textSize, wDrawColor color, BOOL_T boxed );
+track_p NewText( wIndex_t index, coOrd p, ANGLE_T angle, char * text,
+ CSIZE_T textSize, wDrawColor color, BOOL_T boxed );
void LoadFontSizeList( wList_p, long );
void UpdateFontSizeList( long *, wList_p, wIndex_t );
@@ -42,43 +43,42 @@ static wMenu_p textPopupM;
*/
static struct {
- STATE_T state;
- CSIZE_T len;
- coOrd cursPos0, cursPos1;
- POS_T cursHeight;
- POS_T textLen;
- POS_T lastLineLen;
- POS_T lastLineOffset;
- coOrd pos;
- ANGLE_T angle;
- long size;
- wIndex_t fontSizeInx;
- char text[STR_HUGE_SIZE];
- wDrawColor color;
- BOOL_T boxed;
- } Dt;
+ STATE_T state;
+ CSIZE_T len;
+ coOrd cursPos0, cursPos1;
+ POS_T cursHeight;
+ POS_T textLen;
+ POS_T lastLineLen;
+ POS_T lastLineOffset;
+ coOrd pos;
+ ANGLE_T angle;
+ long size;
+ wIndex_t fontSizeInx;
+ char text[STR_HUGE_SIZE];
+ wDrawColor color;
+ BOOL_T boxed;
+} Dt;
static char * boxLabels[] = { "", NULL };
static paramData_t textPLs[] = {
#define textPD (textPLs[0])
- { PD_DROPLIST, &Dt.fontSizeInx, "fontsize", 0, NULL, N_("Font Size"), BL_EDITABLE },
+ { PD_DROPLIST, &Dt.fontSizeInx, "fontsize", 0, NULL, N_("Font Size"), BL_EDITABLE },
#define colorPD (textPLs[1])
- { PD_COLORLIST, &Dt.color, "color", PDO_NORECORD, NULL, N_("Color") },
+ { PD_COLORLIST, &Dt.color, "color", PDO_NORECORD, NULL, N_("Color") },
#define boxPD (textPLs[2])
- { PD_TOGGLE, &Dt.boxed, "boxed", 0, boxLabels, N_("Boxed"), 0 }
- };
+ { PD_TOGGLE, &Dt.boxed, "boxed", 0, boxLabels, N_("Boxed"), 0 }
+};
static paramGroup_t textPG = { "text", 0, textPLs, COUNT( textPLs ) };
-enum TEXT_POSITION
-{
+enum TEXT_POSITION {
POSITION_TEXT = 0,
SHOW_TEXT
};
static void TextDlgUpdate(
- paramGroup_p pg,
- int inx,
- void * context )
+ paramGroup_p pg,
+ int inx,
+ void * context )
{
coOrd size, lastline;
@@ -100,7 +100,7 @@ static void TextDlgUpdate(
Dt.cursPos0.x = Dt.cursPos1.x = Dt.pos.x+Dt.lastLineLen;
Dt.cursPos1.y = Dt.pos.y+Dt.cursHeight+Dt.lastLineOffset;
}
- break;
+ break;
}
}
@@ -115,7 +115,7 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
switch (action & 0xFF) {
case C_START:
- Dt.state = POSITION_TEXT;
+ Dt.state = POSITION_TEXT;
Dt.cursPos0 = Dt.cursPos1 = zero;
Dt.len = 0;
Dt.textLen = 0;
@@ -123,8 +123,7 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
Dt.lastLineLen = 0;
Dt.lastLineOffset = 0;
- if (textPD.control == NULL)
- {
+ if (textPD.control == NULL) {
ParamCreateControls(&textPG, TextDlgUpdate);
LoadFontSizeList((wList_p)textPD.control, Dt.size);
ParamRegister(&textPG);
@@ -140,11 +139,11 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
controls[0] = textPD.control;
controls[1] = colorPD.control;
- controls[2] = boxPD.control;
- controls[3] = 0;
+ controls[2] = boxPD.control;
+ controls[3] = 0;
labels[0] = N_("Font Size");
- labels[1] = N_("Color");
- labels[2] = N_("Boxed");
+ labels[1] = N_("Color");
+ labels[2] = N_("Boxed");
InfoSubstituteControls( controls, labels );
return C_CONTINUE;
break;
@@ -154,17 +153,18 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
Dt.pos = pos;
Dt.cursPos0.y = Dt.cursPos1.y = pos.y + Dt.lastLineOffset;
Dt.cursPos0.x = Dt.cursPos1.x = pos.x + Dt.lastLineLen;
- DrawTextSize(&mainD, "Aquilp", NULL, Dt.size, TRUE, &size); //In case fontsize change
+ DrawTextSize(&mainD, "Aquilp", NULL, Dt.size, TRUE,
+ &size); //In case fontsize change
Dt.cursHeight = size.y;
Dt.cursPos1.y += Dt.cursHeight;
- Dt.state = SHOW_TEXT;
+ Dt.state = SHOW_TEXT;
return C_CONTINUE;
case C_MOVE:
Dt.pos = pos;
Dt.cursPos0.y = Dt.cursPos1.y = pos.y + Dt.lastLineOffset;
Dt.cursPos0.x = Dt.cursPos1.x = pos.x + Dt.lastLineLen;
Dt.cursPos1.y += Dt.cursHeight;
- return C_CONTINUE;
+ return C_CONTINUE;
case C_UP:
return C_CONTINUE;
case C_TEXT:
@@ -172,7 +172,7 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
NoticeMessage( MSG_SEL_POS_FIRST, _("Ok"), NULL );
return C_CONTINUE;
}
-
+
c = (unsigned char)(action >> 8);
switch (c) {
case '\b':
@@ -192,7 +192,8 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
break;
case '\015':
UndoStart( _("Create Text"), "newText - CR" );
- t = NewText( 0, Dt.pos, Dt.angle, Dt.text, (CSIZE_T)Dt.size, Dt.color, Dt.boxed );
+ t = NewText( 0, Dt.pos, Dt.angle, Dt.text, (CSIZE_T)Dt.size, Dt.color,
+ Dt.boxed );
UndoEnd();
DrawNewTrack(t);
Dt.state = POSITION_TEXT;
@@ -210,21 +211,23 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
InfoMessage("Text too long - truncated");
wBeep();
}
- DrawMultiLineTextSize( &mainD, Dt.text, NULL, Dt.size, TRUE, &size, &lastline);
+ DrawMultiLineTextSize( &mainD, Dt.text, NULL, Dt.size, TRUE, &size, &lastline);
Dt.textLen = size.x;
Dt.lastLineLen = lastline.x;
Dt.lastLineOffset = lastline.y;
Dt.cursPos0.x = Dt.cursPos1.x = Dt.pos.x + Dt.lastLineLen;
Dt.cursPos0.y = Dt.cursPos1.y = Dt.pos.y + Dt.lastLineOffset;
POS_T descent, ascent;
- DrawTextSize2(&mainD, "Aquilp", NULL, Dt.size, TRUE, &size, &descent, &ascent); //In case fontsize change
+ DrawTextSize2(&mainD, "Aquilp", NULL, Dt.size, TRUE, &size, &descent,
+ &ascent); //In case fontsize change
Dt.cursHeight = size.y;
Dt.cursPos0.y -=descent;
Dt.cursPos1.y +=Dt.cursHeight;
return C_CONTINUE;
case C_REDRAW:
DrawLine( &tempD, Dt.cursPos0, Dt.cursPos1, 0, Dt.color );
- DrawMultiString(&tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color, 0.0, NULL, NULL, Dt.boxed );
+ DrawMultiString(&tempD, Dt.pos, Dt.text, NULL, (FONTSIZE_T)Dt.size, Dt.color,
+ 0.0, NULL, NULL, Dt.boxed );
return C_CONTINUE;
case C_CANCEL:
if (Dt.state != POSITION_TEXT) {
@@ -237,7 +240,8 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
Dt.state = POSITION_TEXT;
if (Dt.len) {
UndoStart( _("Create Text"), "newText - OK" );
- t = NewText( 0, Dt.pos, Dt.angle, Dt.text, (CSIZE_T)Dt.size, Dt.color, Dt.boxed );
+ t = NewText( 0, Dt.pos, Dt.angle, Dt.text, (CSIZE_T)Dt.size, Dt.color,
+ Dt.boxed );
UndoEnd();
DrawNewTrack(t);
}
@@ -246,10 +250,11 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
return C_TERMINATE;
case C_FINISH:
- if (Dt.state != POSITION_TEXT && Dt.len > 0)
- CmdText( C_OK, pos );
- else
+ if (Dt.state != POSITION_TEXT && Dt.len > 0) {
+ CmdText( C_OK, pos );
+ } else {
CmdText( C_CANCEL, pos );
+ }
return C_TERMINATE;
case C_CMDMENU:
@@ -261,15 +266,17 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
}
-#include "bitmaps/text.xpm"
+#include "bitmaps/text.xpm3"
void InitCmdText( wMenu_p menu )
{
- AddMenuButton( menu, CmdText, "cmdText", _("Text"), wIconCreatePixMap(text_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_CMDMENU|IC_POPUP2, ACCL_TEXT, NULL );
+ AddMenuButton( menu, CmdText, "cmdText", _("Text"),
+ wIconCreatePixMap(text_xpm3[iconSize]), LEVEL0_50,
+ IC_STICKY|IC_CMDMENU|IC_POPUP2, ACCL_TEXT, NULL );
textPopupM = MenuRegister( "Text Font" );
wMenuPushCreate( textPopupM, "", _("Fonts..."), 0, SelectFont, NULL );
Dt.size = (CSIZE_T)wSelectedFontSize();
- Dt.color = wDrawColorBlack;
+ Dt.color = wDrawColorBlack;
}
void InitTrkText( void )
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 23:03:11 +0000