bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Success build Golded+ in MacOSX

Browse Source
This commit is contained in:
Stas Degteff 2006-01-14 23:48:53 +00:00
parent b83958247c
commit 9b3a825e1c
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
golded3/geedit.cpp
View File

@ -151,7 +151,7 @@ vattr IEclass::dispchar(vchar __ch, vattr attr) {
// ------------------------------------------------------------------ // ------------------------------------------------------------------
void IEclass::cursoroff() { void IEclass::cursoroff() {
vcurhide(); vcurhide();
} }
@ -159,7 +159,7 @@ void IEclass::cursoroff() {
// ------------------------------------------------------------------ // ------------------------------------------------------------------
void IEclass::cursoron() { void IEclass::cursoron() {
vcurshow(); vcurshow();
} }
@ -256,7 +256,7 @@ void IEclass::gotorowcol(uint __col, uint __row) {
void IEclass::dispstringsc(char *__buf, uint __beg, uint __end, uint __row, uint __col, char endchar) void IEclass::dispstringsc(char *__buf, uint __beg, uint __end, uint __row, uint __col, char endchar)
{ {
char scbuf[EDIT_BUFLEN]; char scbuf[EDIT_BUFLEN];
uint bbeg = __beg; uint bbeg = __beg;
uint bend = __beg; uint bend = __beg;
uint bpos = __beg; uint bpos = __beg;
@ -283,7 +283,7 @@ void IEclass::dispstringsc(char *__buf, uint __beg, uint __end, uint __row, uint
} }
scbuf[scpos] = NUL; scbuf[scpos] = NUL;
if (schecker.Check(scbuf)) if (schecker.Check(scbuf))
bend = bpos; bend = bpos;
else else
@ -690,7 +690,7 @@ Line* IEclass::insertlinebelow(Line* __currline, const char* __text, long __batc
_nextline->next->prev = _nextline; _nextline->next->prev = _nextline;
__currline->next = _nextline; __currline->next = _nextline;
} }
Undo->PushItem(EDIT_UNDO_NEW_LINE|batch_mode|__batch_mode, _nextline); Undo->PushItem(EDIT_UNDO_NEW_LINE|batch_mode|__batch_mode, _nextline);
GFTRK(NULL); GFTRK(NULL);
@ -944,7 +944,7 @@ Line* IEclass::wrapit(Line** __currline, uint* __curr_col, uint* __curr_row, boo
// Keep copy of original pointer // Keep copy of original pointer
int _atmargin = _wrappos; int _atmargin = _wrappos;
// Search backwards until a space or the beginning of the line is found // Search backwards until a space or the beginning of the line is found
while((_wrappos > _quotelen) and (_thisline->txt[_wrappos-1] != ' ')) while((_wrappos > _quotelen) and (_thisline->txt[_wrappos-1] != ' '))
_wrappos--; _wrappos--;
@ -1342,7 +1342,7 @@ void IEclass::DelChar() {
if(_thisline->next) if(_thisline->next)
_thisline->next->prev = _thisline; _thisline->next->prev = _thisline;
Undo->PushItem(EDIT_UNDO_DEL_LINE|BATCH_MODE, _nextline); Undo->PushItem(EDIT_UNDO_DEL_LINE|BATCH_MODE, _nextline);
} }
batch_mode = BATCH_MODE; batch_mode = BATCH_MODE;
@ -1406,9 +1406,9 @@ void IEclass::GoWordLeft() {
} }
} }
else { else {
col--; col--;
if(not isxalnum(currline->txt[col])) { if(not isxalnum(currline->txt[col])) {
while(not isxalnum(currline->txt[col]) and (col > 0)) while(not isxalnum(currline->txt[col]) and (col > 0))
col--; col--;
@ -1508,7 +1508,7 @@ void IEclass::Newline() {
Undo->PushItem(EDIT_UNDO_INS_TEXT|batch_mode, currline, col, 1); Undo->PushItem(EDIT_UNDO_INS_TEXT|batch_mode, currline, col, 1);
batch_mode = BATCH_MODE; batch_mode = BATCH_MODE;
// Copy linefeed+nul to the split position // Copy linefeed+nul to the split position
currline->txt.erase(_splitpos); currline->txt.erase(_splitpos);
currline->txt += "\n"; currline->txt += "\n";
@ -1587,7 +1587,7 @@ void IEclass::DupLine() {
Undo->PushItem(EDIT_UNDO_VOID); Undo->PushItem(EDIT_UNDO_VOID);
batch_mode = BATCH_MODE; batch_mode = BATCH_MODE;
Line* _nextline = insertlinebelow(currline, currline->txt.c_str(), batch_mode); Line* _nextline = insertlinebelow(currline, currline->txt.c_str(), batch_mode);
_nextline->type = currline->type & ~GLINE_BLOK; _nextline->type = currline->type & ~GLINE_BLOK;
_nextline->color = currline->color; _nextline->color = currline->color;
@ -1777,7 +1777,7 @@ void IEclass::DeleteEOL() {
GFTRK("EditDeleteEOL"); GFTRK("EditDeleteEOL");
bool _has_linefeed = (currline->txt.find('\n') != currline->txt.npos); bool _has_linefeed = (currline->txt.find('\n') != currline->txt.npos);
Undo->PushItem(EDIT_UNDO_DEL_TEXT, currline); Undo->PushItem(EDIT_UNDO_DEL_TEXT, currline);
currline->txt.erase(col); currline->txt.erase(col);
@ -1826,7 +1826,7 @@ void IEclass::deleteline(bool zapquotesbelow) {
bool done = false; bool done = false;
do { do {
// Break if need to zap quotes, but the current line is not quote and is not empty // Break if need to zap quotes, but the current line is not quote and is not empty
if(zapquotesbelow and not ((currline->type & GLINE_QUOT) or isempty(currline))) if(zapquotesbelow and not ((currline->type & GLINE_QUOT) or isempty(currline)))
break; break;
@ -2513,7 +2513,7 @@ void IEclass::SCodeChange(gkey key)
return; return;
} }
if ((_ch != c1) && (c1 == c2) && if ((_ch != c1) && (c1 == c2) &&
((c1 == '*') || (c1 == '/') || (c1 == '_') || (c1 == '#'))) ((c1 == '*') || (c1 == '/') || (c1 == '_') || (c1 == '#')))
replace = true; replace = true;
@ -2525,7 +2525,7 @@ void IEclass::SCodeChange(gkey key)
if (_ch != ' ') insertchar(_ch); if (_ch != ' ') insertchar(_ch);
cltxt = currline->txt.c_str(); cltxt = currline->txt.c_str();
while (!isspace(cltxt[col+1]) && !strchr(punct, cltxt[col+1])) while (!isspace(cltxt[col+1]) && !strchr(punct, cltxt[col+1]))
GoRight(); GoRight();
if (replace) DelChar(); if (replace) DelChar();
@ -2642,7 +2642,7 @@ int IEclass::handlekey(gkey __key) {
int rc = true; int rc = true;
if (drawlines && if (drawlines &&
(__key != KK_EditGoRight) && (__key != KK_EditGoLeft) && (__key != KK_EditGoRight) && (__key != KK_EditGoLeft) &&
(__key != KK_EditGoUp) && (__key != KK_EditGoDown)) (__key != KK_EditGoUp) && (__key != KK_EditGoDown))
{ {
@ -2819,7 +2819,7 @@ noselecting:
if(__key != KK_EditUndo) if(__key != KK_EditUndo)
undo_ready = NO; undo_ready = NO;
return rc; return rc;
} }
@ -2926,7 +2926,9 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) {
vcurlarge(); vcurlarge();
gkey _ch; gkey _ch;
#if defined(__WIN32__)
gkey keystatus = 0; gkey keystatus = 0;
#endif
do { do {
_ch = getxchtick(); _ch = getxchtick();
@ -3059,7 +3061,7 @@ UndoStack::UndoStack(IEclass* this_editor) :
minrow(editor->minrow), minrow(editor->minrow),
maxrow(editor->maxrow), maxrow(editor->maxrow),
thisrow(editor->thisrow), thisrow(editor->thisrow),
currline(editor->currline), currline(editor->currline),
undo_ready(editor->undo_ready) { undo_ready(editor->undo_ready) {
UndoItem::last_item = &last_item; UndoItem::last_item = &last_item;
last_item = NULL; last_item = NULL;
@ -3169,7 +3171,7 @@ void UndoStack::PushItem(uint action, Line* __line, uint __col, uint __len) {
last_item->line = currline; last_item->line = currline;
last_item->data.line_ptr = NULL; last_item->data.line_ptr = NULL;
break; break;
} }
} }
GFTRK(NULL); GFTRK(NULL);

2
goldlib/gall/gdefs.h
View File

@ -149,7 +149,9 @@ typedef uint8_t byte;
typedef uint16_t word; typedef uint16_t word;
typedef uint32_t dword; typedef uint32_t dword;
#if !defined(__APPLE__)
typedef unsigned int uint; typedef unsigned int uint;
#endif
typedef uint8_t bits; typedef uint8_t bits;
typedef uint32_t time32_t; /* 32-bit time_t type */ typedef uint32_t time32_t; /* 32-bit time_t type */