Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 07:26:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

more indentation fixes in src/Fl_win32.cxx

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6668 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser
2009-02-21 10:18:47 +00:00
parent f04bc53457
commit 9effc624af
1 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_win32.cxx
+57 -60
View File
@@ -491,9 +491,9 @@ char fl_i_own_selection[2];
UINT fl_get_lcid_codepage(LCID id) UINT fl_get_lcid_codepage(LCID id)
{ {
char buf[8]; char buf[8];
buf[GetLocaleInfo(id, LOCALE_IDEFAULTANSICODEPAGE, buf, 8)] = 0; buf[GetLocaleInfo(id, LOCALE_IDEFAULTANSICODEPAGE, buf, 8)] = 0;
return atol(buf); return atol(buf);
} }
// Convert \n -> \r\n // Convert \n -> \r\n
@@ -558,7 +558,7 @@ void Fl::copy(const char *stuff, int len, int clipboard) {
// if the system clipboard works, use it // if the system clipboard works, use it
int utf16_len = fl_utf8toUtf16(fl_selection_buffer[clipboard], fl_selection_length[clipboard], 0, 0); int utf16_len = fl_utf8toUtf16(fl_selection_buffer[clipboard], fl_selection_length[clipboard], 0, 0);
EmptyClipboard(); EmptyClipboard();
HGLOBAL hMem = GlobalAlloc(GHND, utf16_len * 2 + 2); // moveable and zero'ed mem alloc. HGLOBAL hMem = GlobalAlloc(GHND, utf16_len * 2 + 2); // moveable and zero'ed mem alloc.
LPVOID memLock = GlobalLock(hMem); LPVOID memLock = GlobalLock(hMem);
fl_utf8toUtf16(fl_selection_buffer[clipboard], fl_selection_length[clipboard], (unsigned short*) memLock, utf16_len * 2); fl_utf8toUtf16(fl_selection_buffer[clipboard], fl_selection_length[clipboard], (unsigned short*) memLock, utf16_len * 2);
GlobalUnlock(hMem); GlobalUnlock(hMem);
@@ -602,8 +602,7 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
HANDLE h = GetClipboardData(CF_UNICODETEXT); HANDLE h = GetClipboardData(CF_UNICODETEXT);
if (h) { if (h) {
wchar_t *memLock = (wchar_t*) GlobalLock(h); wchar_t *memLock = (wchar_t*) GlobalLock(h);
int utf16_len = int utf16_len = wcslen(memLock);
wcslen(memLock);
Fl::e_text = (char*) malloc (utf16_len * 4 + 1); Fl::e_text = (char*) malloc (utf16_len * 4 + 1);
int utf8_len = fl_utf8fromwc(Fl::e_text, utf16_len * 4, memLock, utf16_len); int utf8_len = fl_utf8fromwc(Fl::e_text, utf16_len * 4, memLock, utf16_len);
*(Fl::e_text + utf8_len) = 0; *(Fl::e_text + utf8_len) = 0;
@@ -628,26 +627,25 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
char fl_is_ime = 0; char fl_is_ime = 0;
void fl_get_codepage() void fl_get_codepage()
{ {
HKL hkl = GetKeyboardLayout(0); HKL hkl = GetKeyboardLayout(0);
TCHAR ld[8]; TCHAR ld[8];
GetLocaleInfo (LOWORD(hkl), GetLocaleInfo (LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE, ld, 6);
LOCALE_IDEFAULTANSICODEPAGE, ld, 6); DWORD ccp = atol(ld);
DWORD ccp = atol(ld); fl_is_ime = 0;
fl_is_ime = 0;
fl_codepage = ccp; fl_codepage = ccp;
if (fl_aimm) { if (fl_aimm) {
fl_aimm->GetCodePageA(GetKeyboardLayout(0), &fl_codepage); fl_aimm->GetCodePageA(GetKeyboardLayout(0), &fl_codepage);
} else if (get_imm_module() && flImmIsIME(hkl)) { } else if (get_imm_module() && flImmIsIME(hkl)) {
fl_is_ime = 1; fl_is_ime = 1;
} }
} }
HWND fl_capture; HWND fl_capture;
static int mouse_event(Fl_Window *window, int what, int button, static int mouse_event(Fl_Window *window, int what, int button,
WPARAM wParam, LPARAM lParam) WPARAM wParam, LPARAM lParam)
{ {
static int px, py, pmx, pmy; static int px, py, pmx, pmy;
POINT pt; POINT pt;
@@ -784,9 +782,9 @@ extern HPALETTE fl_select_palette(void); // in fl_color_win32.cxx
struct Win32Timer struct Win32Timer
{ {
UINT_PTR handle; UINT_PTR handle;
Fl_Timeout_Handler callback; Fl_Timeout_Handler callback;
void *data; void *data;
}; };
static Win32Timer* win32_timers; static Win32Timer* win32_timers;
static int win32_timer_alloc; static int win32_timer_alloc;
@@ -795,22 +793,22 @@ static HWND s_TimerWnd;
static void realloc_timers() static void realloc_timers()
{ {
if (win32_timer_alloc == 0) { if (win32_timer_alloc == 0) {
win32_timer_alloc = 8; win32_timer_alloc = 8;
} }
win32_timer_alloc *= 2; win32_timer_alloc *= 2;
Win32Timer* new_timers = new Win32Timer[win32_timer_alloc]; Win32Timer* new_timers = new Win32Timer[win32_timer_alloc];
memset(new_timers, 0, sizeof(Win32Timer) * win32_timer_used); memset(new_timers, 0, sizeof(Win32Timer) * win32_timer_used);
memcpy(new_timers, win32_timers, sizeof(Win32Timer) * win32_timer_used); memcpy(new_timers, win32_timers, sizeof(Win32Timer) * win32_timer_used);
Win32Timer* delete_me = win32_timers; Win32Timer* delete_me = win32_timers;
win32_timers = new_timers; win32_timers = new_timers;
delete [] delete_me; delete [] delete_me;
} }
static void delete_timer(Win32Timer& t) static void delete_timer(Win32Timer& t)
{ {
KillTimer(s_TimerWnd, t.handle); KillTimer(s_TimerWnd, t.handle);
memset(&t, 0, sizeof(Win32Timer)); memset(&t, 0, sizeof(Win32Timer));
} }
/// END TIMERS /// END TIMERS
@@ -1015,10 +1013,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
static char buffer[1024]; static char buffer[1024];
if (uMsg == WM_CHAR || uMsg == WM_SYSCHAR) { if (uMsg == WM_CHAR || uMsg == WM_SYSCHAR) {
xchar u = (xchar) wParam; xchar u = (xchar) wParam;
// Fl::e_length = fl_unicode2utf(&u, 1, buffer); // Fl::e_length = fl_unicode2utf(&u, 1, buffer);
Fl::e_length = fl_utf8fromwc(buffer, 1024, &u, 1); Fl::e_length = fl_utf8fromwc(buffer, 1024, &u, 1);
buffer[Fl::e_length] = 0; buffer[Fl::e_length] = 0;
} else if (Fl::e_keysym >= FL_KP && Fl::e_keysym <= FL_KP_Last) { } else if (Fl::e_keysym >= FL_KP && Fl::e_keysym <= FL_KP_Last) {
@@ -1158,18 +1156,17 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
case WM_RENDERFORMAT: { case WM_RENDERFORMAT: {
HANDLE h; HANDLE h;
// int l = fl_utf_nb_char((unsigned char*)fl_selection_buffer[1], fl_selection_length[1]); // int l = fl_utf_nb_char((unsigned char*)fl_selection_buffer[1], fl_selection_length[1]);
int l = fl_utf8toUtf16(fl_selection_buffer[1], fl_selection_length[1], NULL, 0); // Pass NULL buffer to query length required int l = fl_utf8toUtf16(fl_selection_buffer[1], fl_selection_length[1], NULL, 0); // Pass NULL buffer to query length required
h = GlobalAlloc(GHND, (l+1) * sizeof(unsigned short)); h = GlobalAlloc(GHND, (l+1) * sizeof(unsigned short));
if (h) { if (h) {
unsigned short *g = (unsigned short*) GlobalLock(h); unsigned short *g = (unsigned short*) GlobalLock(h);
// fl_utf2unicode((unsigned char *)fl_selection_buffer[1], fl_selection_length[1], (xchar*)g); // fl_utf2unicode((unsigned char *)fl_selection_buffer[1], fl_selection_length[1], (xchar*)g);
l = fl_utf8toUtf16(fl_selection_buffer[1], fl_selection_length[1], g, (l+1)); l = fl_utf8toUtf16(fl_selection_buffer[1], fl_selection_length[1], g, (l+1));
g[l] = 0; g[l] = 0;
GlobalUnlock(h); GlobalUnlock(h);
SetClipboardData(CF_UNICODETEXT, h); SetClipboardData(CF_UNICODETEXT, h);
} }
// Windoze also seems unhappy if I don't do this. Documentation very // Windoze also seems unhappy if I don't do this. Documentation very
// unclear on what is correct: // unclear on what is correct:
@@ -1182,7 +1179,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
} }
return DefWindowProcW(hWnd, uMsg, wParam, lParam); return DefWindowProcW(hWnd, uMsg, wParam, lParam);
} }
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
@@ -1338,7 +1335,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
/* /*
* This silly little class remembers the name of all window classes * This silly little class remembers the name of all window classes
* we register to avoid double registration. It has the added bonus * we register to avoid double registration. It has the added bonus
* of freeing everything on application colse as well. * of freeing everything on application close as well.
*/ */
class NameList { class NameList {
public: public:
@@ -1509,9 +1506,9 @@ Fl_X* Fl_X::make(Fl_Window* w) {
WCHAR *lab = NULL; WCHAR *lab = NULL;
if (w->label()) { if (w->label()) {
int l = strlen(w->label()); int l = strlen(w->label());
// lab = (WCHAR*) malloc((l + 1) * sizeof(short)); // lab = (WCHAR*) malloc((l + 1) * sizeof(short));
// l = fl_utf2unicode((unsigned char*)w->label(), l, (xchar*)lab); // l = fl_utf2unicode((unsigned char*)w->label(), l, (xchar*)lab);
// lab[l] = 0; // lab[l] = 0;
unsigned wlen = fl_utf8toUtf16(w->label(), l, NULL, 0); // Pass NULL to query length unsigned wlen = fl_utf8toUtf16(w->label(), l, NULL, 0); // Pass NULL to query length
wlen++; wlen++;
lab = (WCHAR *) malloc(sizeof(WCHAR)*wlen); lab = (WCHAR *) malloc(sizeof(WCHAR)*wlen);
@@ -1654,7 +1651,7 @@ void Fl::repeat_timeout(double time, Fl_Timeout_Handler cb, void* data)
win32_timers[timer_id].data = data; win32_timers[timer_id].data = data;
win32_timers[timer_id].handle = win32_timers[timer_id].handle =
SetTimer(s_TimerWnd, timer_id + 1, elapsed, NULL); SetTimer(s_TimerWnd, timer_id + 1, elapsed, NULL);
} }
int Fl::has_timeout(Fl_Timeout_Handler cb, void* data) int Fl::has_timeout(Fl_Timeout_Handler cb, void* data)
@@ -1736,10 +1733,10 @@ void Fl_Window::label(const char *name,const char *iname) {
int l = strlen(name); int l = strlen(name);
// WCHAR *lab = (WCHAR*) malloc((l + 1) * sizeof(short)); // WCHAR *lab = (WCHAR*) malloc((l + 1) * sizeof(short));
// l = fl_utf2unicode((unsigned char*)name, l, (xchar*)lab); // l = fl_utf2unicode((unsigned char*)name, l, (xchar*)lab);
unsigned wlen = fl_utf8toUtf16(name, l, NULL, 0); // Pass NULL to query length unsigned wlen = fl_utf8toUtf16(name, l, NULL, 0); // Pass NULL to query length
wlen++; wlen++;
unsigned short * lab = (unsigned short*)malloc(sizeof(unsigned short)*wlen); unsigned short * lab = (unsigned short*)malloc(sizeof(unsigned short)*wlen);
wlen = fl_utf8toUtf16(name, l, lab, wlen); wlen = fl_utf8toUtf16(name, l, lab, wlen);
lab[wlen] = 0; lab[wlen] = 0;
SetWindowTextW(i->xid, (WCHAR *)lab); SetWindowTextW(i->xid, (WCHAR *)lab);
free(lab); free(lab);