mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed strange indents, added implied break, notreached clarification. 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7769 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Greg Ercolano 2010-10-29 02:53:37 +00:00
parent 86f82cce6a
commit 9a84309f51
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Fl_Input.cxx
View File

@ -475,6 +475,7 @@ int Fl_Input::handle_key() {
// insert a few selected control characters literally: // insert a few selected control characters literally:
if (input_type() != FL_FLOAT_INPUT && input_type() != FL_INT_INPUT) if (input_type() != FL_FLOAT_INPUT && input_type() != FL_INT_INPUT)
return replace(position(), mark(), &ascii, 1); return replace(position(), mark(), &ascii, 1);
break;
} }
return 0; return 0;
@ -521,23 +522,23 @@ int Fl_Input::handle(int event) {
window()->cursor(FL_CURSOR_NONE); window()->cursor(FL_CURSOR_NONE);
return handle_key(); return handle_key();
} }
//NOTREACHED
case FL_PUSH: case FL_PUSH:
if (Fl::dnd_text_ops()) { if (Fl::dnd_text_ops()) {
int oldpos = position(), oldmark = mark(); int oldpos = position(), oldmark = mark();
Fl_Boxtype b = box(); Fl_Boxtype b = box();
Fl_Input_::handle_mouse( Fl_Input_::handle_mouse(x()+Fl::box_dx(b), y()+Fl::box_dy(b),
x()+Fl::box_dx(b), y()+Fl::box_dy(b),
w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0); w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0);
newpos = position(); newpos = position();
position( oldpos, oldmark ); position( oldpos, oldmark );
if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) && input_type()!=FL_SECRET_INPUT && if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) && input_type()!=FL_SECRET_INPUT &&
( (newpos >= mark() && newpos < position()) ( (newpos >= mark() && newpos < position()) ||
|| (newpos >= position() && newpos < mark())) ) { (newpos >= position() && newpos < mark()) ) ) {
// user clicked in the selection, may be trying to drag // user clicked in the selection, may be trying to drag
drag_start = newpos; drag_start = newpos;
return 1; return 1;
} }
drag_start = -1; drag_start = -1;
} }
@ -602,12 +603,11 @@ int Fl_Input::handle(int event) {
return 0; return 0;
} }
#endif #endif
{ {
Fl_Boxtype b = box(); Fl_Boxtype b = box();
Fl_Input_::handle_mouse( Fl_Input_::handle_mouse(x()+Fl::box_dx(b), y()+Fl::box_dy(b),
x()+Fl::box_dx(b), y()+Fl::box_dy(b), w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0);
w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0); }
}
return 1; return 1;
case FL_DND_LEAVE: case FL_DND_LEAVE:
@ -636,7 +636,6 @@ int Fl_Input::handle(int event) {
} }
return 1; return 1;
*/ */
} }
Fl_Boxtype b = box(); Fl_Boxtype b = box();
return Fl_Input_::handletext(event, return Fl_Input_::handletext(event,