dwindows: os2/dw.c comparison

comparison os2/dw.c @ 995:65ccdda2d743

Fixes to MLE handling to make it work like the other platforms. Carriage returns are now stripped and the MLE is in no translate mode so the insertion point is the same as the returned buffer.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 07 May 2011 19:49:24 +0000
parents	3d898b78c2ad
children	69cf9f26e899

comparison

equal deleted inserted replaced

-:f1c7b03f944d
+:65ccdda2d743
 0,0,2000,1000,
 NULLHANDLE,
 HWND_TOP,
 id,
 NULL,
 NULL);
+WinSendMsg(tmp, MLM_FORMAT, MLFIE_NOTRANS, 0);
 blah->oldproc = WinSubclassWindow(tmp, _mleproc);
 WinSetWindowPtr(tmp, QWP_USER, blah);
 dw_window_set_font(tmp, DefaultFont);
 return tmp;
 }
 void API dw_listbox_delete(HWND handle, int index)
 {
 WinSendMsg(handle, LM_DELETEITEM, MPFROMSHORT(index), 0);
 }
+void _strip_cr(char *dest, char *src)
+{
+int z, x = 0;
+for(z=0;z<strlen(src);z++)
+{
+if(src[z] != '\r')
+{
+dest[x] = src[z];
+x++;
+}
+}
+dest[x] = 0;
+}
 /*
 * Adds text to an MLE box and returns the current point.
 * Parameters:
 *          handle: Handle to the MLE to be queried.
 *          buffer: Text buffer to be imported.
 {
 int amount, len = strlen(buffer), written = 0;
 while(written < len)
 {
+int z, x = 0;
+char buf[1024];
 if((len - written) > 65535)
 amount = 65535;
 else
 amount = len - written;
-memcpy(mlebuf, &buffer[written], amount);
+/* Remove Carriage Returns \r */
-mlebuf[amount] = '\0';
+for(z=0;z<amount;z++)
+{
-WinSendMsg(handle, MLM_SETIMPORTEXPORT, MPFROMP(mlebuf), MPFROMLONG(amount + 1));
+if(buffer[z] != '\r')
-WinSendMsg(handle, MLM_IMPORT, MPFROMP(&point), MPFROMLONG(amount + 1));
+{
-dw_mle_delete(handle, point, 1);
+mlebuf[x] = buffer[z];
+x++;
+}
+}
+if(point < 0)
+point = 0;
+WinSendMsg(handle, MLM_SETIMPORTEXPORT, MPFROMP(mlebuf), MPFROMLONG(x));
+WinSendMsg(handle, MLM_IMPORT, MPFROMP(&point), MPFROMLONG(x));
 written += amount;
 }
 DosFreeMem(mlebuf);
 }
-return point - 1;
+return point;
 }
 /*
 * Grabs text from an MLE box.
 * Parameters:
 *          startpoint: Point to start grabbing text.
 *          length: Amount of text to be grabbed.
 */
 void API dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
 {
 PBYTE mlebuf;
 /* Work around 64K limit */
 if(!DosAllocMem((PPVOID) &mlebuf, 65535, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_TILE))
 {
 int amount, copied, written = 0;
 *          startpoint: Point to start deleting text.
 *          length: Amount of text to be deleted.
 */
 void API dw_mle_delete(HWND handle, int startpoint, int length)
 {
-char *buf = malloc(length+1);
+WinSendMsg(handle, MLM_DELETE, MPFROMLONG(startpoint), MPFROMLONG(length));
-int z, dellen = length;
-dw_mle_export(handle, buf, startpoint, length);
-for(z=0;z<length-1;z++)
-{
-if(strncmp(&buf[z], "\r\n", 2) == 0)
-dellen--;
-}
-WinSendMsg(handle, MLM_DELETE, MPFROMLONG(startpoint), MPFROMLONG(dellen));
-free(buf);
 }
 /*
 * Clears all text from an MLE box.
 * Parameters:
 *          handle: Handle to the MLE to be positioned.
 *          point: Point to position cursor.
 */
 void API dw_mle_set_cursor(HWND handle, int point)
 {
+point--;
 WinSendMsg(handle, MLM_SETSEL, MPFROMLONG(point), MPFROMLONG(point));
 }
 /*
 * Finds text in an MLE box.

Mercurial > dwindows

comparison os2/dw.c @ 995:65ccdda2d743