diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-02-11 12:02:36 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-02-11 12:02:36 +0000 |
| commit | 50ee3bcd66c4baa6bb3388f5b955d726bfc6bdd8 (patch) | |
| tree | 4b62978d21ee57df7027461b8ea2846c17308d11 /src/Fl_compose.cxx | |
| parent | a3c0dac034c919c2714f3f129a9f5d9d26ae3de4 (diff) | |
Mark places that need to be refactored with // PORTME:
Searching for __APPLE, WIN32 or X11 did give me many false results. I instead marked most ifdef's that I would like to get rid of with the text // PORTME:, so they can be easily found by a global search.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11155 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_compose.cxx')
| -rw-r--r-- | src/Fl_compose.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx index 3bb0c1ac7..40c4b10cd 100644 --- a/src/Fl_compose.cxx +++ b/src/Fl_compose.cxx @@ -26,12 +26,12 @@ Utility functions to support text input. #ifndef FL_DOXYGEN int Fl::compose_state = 0; -#ifdef __APPLE__ +#ifdef __APPLE__ // PORTME: platform character composition int Fl_X::next_marked_length = 0; #endif #endif -#if defined(WIN32) || defined(__APPLE__) +#if defined(WIN32) || defined(__APPLE__) // PORTME: platform character composition #elif defined(FL_PORTING) # pragma message "FL_PORTING: implement keyboard composing in the code below" #else // X11 @@ -80,7 +80,7 @@ extern XIC fl_xim_ic; */ int Fl::compose(int& del) { int condition; -#if defined(__APPLE__) +#if defined(__APPLE__) // PORTME: platform character composition int has_text_key = Fl::compose_state || Fl::e_keysym <= '~' || Fl::e_keysym == FL_Iso_Key || (Fl::e_keysym >= FL_KP && Fl::e_keysym <= FL_KP_Last && Fl::e_keysym != FL_KP_Enter); condition = Fl::e_state&(FL_META | FL_CTRL) || @@ -93,10 +93,10 @@ unsigned char ascii = (unsigned char)e_text[0]; #else condition = (e_state & (FL_ALT | FL_META | FL_CTRL)) && !(ascii & 128) ; #endif // WIN32 -#endif // __APPLE__ +#endif // __APPLE__ // PORTME: platform character composition if (condition) { del = 0; return 0;} // this stuff is to be treated as a function key del = Fl::compose_state; -#ifdef __APPLE__ +#ifdef __APPLE__ // PORTME: platform character composition Fl::compose_state = Fl_X::next_marked_length; #else Fl::compose_state = 0; @@ -106,7 +106,7 @@ unsigned char ascii = (unsigned char)e_text[0]; return 1; } -#ifdef __APPLE__ +#ifdef __APPLE__ // PORTME: platform character composition static int insertion_point_x = 0; static int insertion_point_y = 0; static int insertion_point_height = 0; @@ -132,7 +132,7 @@ void Fl::insertion_point_location(int x, int y, int height) { insertion_point_y = y; insertion_point_height = height; } -#endif // __APPLE__ +#endif // __APPLE__ // PORTME: platform character composition /** If the user moves the cursor, be sure to call Fl::compose_reset(). @@ -143,7 +143,7 @@ void Fl::insertion_point_location(int x, int y, int height) { void Fl::compose_reset() { Fl::compose_state = 0; -#if defined(WIN32) || defined(__APPLE__) +#if defined(WIN32) || defined(__APPLE__) // PORTME: platform character composition #elif defined(FL_PORTING) # pragma message "FL_PORTING: compose reset extra functions" #else |