diff options
Diffstat (limited to 'mail/xfmail/files')
| -rw-r--r-- | mail/xfmail/files/patch-aa | 10 | ||||
| -rw-r--r-- | mail/xfmail/files/patch-src-edit_fl_edit.cpp | 50 | ||||
| -rw-r--r-- | mail/xfmail/files/patch-src-ui_xfmail.cpp | 82 |
3 files changed, 0 insertions, 142 deletions
diff --git a/mail/xfmail/files/patch-aa b/mail/xfmail/files/patch-aa deleted file mode 100644 index 9248fbd333f2..000000000000 --- a/mail/xfmail/files/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ ---- src/mail/mime.cpp.orig Thu Feb 26 04:30:37 2004 -+++ src/mail/mime.cpp Thu Feb 26 04:31:13 2004 -@@ -161,7 +161,7 @@ - { ISO_8859_13, "iso8859-13", "Baltic", NULL, NULL, 1 }, - { ISO_8859_14, "iso8859-14", "Celtic", NULL, NULL, 1 }, - { ISO_8859_15, "iso8859-15", "Western European", NULL, NULL, 1 }, -- { KOI8R, "KOI8-R", "Russian", NULL, NULL, 1 }, -+ { KOI8R, "koi8-r", "Russian", NULL, NULL, 1 }, - { CHAR_UNKNOWN, "unknown", NULL, NULL, NULL, 1 } - }; diff --git a/mail/xfmail/files/patch-src-edit_fl_edit.cpp b/mail/xfmail/files/patch-src-edit_fl_edit.cpp deleted file mode 100644 index 7cf71f4edad2..000000000000 --- a/mail/xfmail/files/patch-src-edit_fl_edit.cpp +++ /dev/null @@ -1,50 +0,0 @@ ---- src/editor/fl_edit.cpp.orig 2011-09-06 15:28:04.000000000 +0200 -+++ src/editor/fl_edit.cpp 2011-09-06 15:29:22.000000000 +0200 -@@ -63,6 +63,30 @@ - #include "textbuf.h" - #include "fl_error.h" - -+ -+/* -+ * This belongs to xforms' implementation -+ */ -+ -+#define IS_FLATBOX( bt ) ( ( bt ) == FL_FRAME_BOX \ -+ || ( bt ) == FL_EMBOSSED_BOX \ -+ || ( bt ) == FL_BORDER_BOX \ -+ || ( bt ) == FL_ROUNDED_BOX ) -+ -+int -+fli_get_default_scrollbarsize( FL_OBJECT * ob ) -+{ -+ int delta = ( FL_abs( ob->bw ) + 3 * ( ob->bw > 0 ) ); -+ int flat = IS_FLATBOX( ob->boxtype ) ? 2 : 0; -+ -+ if ( ob->w > 250 && ob->h > 250 ) -+ return 15 + delta - flat; -+ else if ( ob->w < 150 || ob->h < 150 ) -+ return 13 + delta - flat; -+ else -+ return 14 + delta - flat; -+} -+ - /*********************************************************************** - * - * Some definitions -@@ -107,7 +131,6 @@ - #define TEXT_X_OFFSET 2 - #define TEXT_Y_OFFSET 0 - --extern "C" int fl_get_default_scrollbarsize(FL_OBJECT *); - extern "C" void fl_add_child(FL_OBJECT *, FL_OBJECT *); - - #define FL_ALL_MASK (FL_ALT_MASK|FL_CONTROL_MASK|FL_SHIFT_MASK) -@@ -3200,7 +3223,7 @@ - - /* scrollbar section */ - spec->v_on = spec->h_on = 0; -- spec->vw = spec->hh = fl_get_default_scrollbarsize(ob); -+ spec->vw = spec->hh = fli_get_default_scrollbarsize(ob); - spec->sb = - fl_create_scrollbar(FL_VERT_THIN_SCROLLBAR, x + w - spec->vw, y, - spec->vw, h, ""); diff --git a/mail/xfmail/files/patch-src-ui_xfmail.cpp b/mail/xfmail/files/patch-src-ui_xfmail.cpp deleted file mode 100644 index 83152bbe1564..000000000000 --- a/mail/xfmail/files/patch-src-ui_xfmail.cpp +++ /dev/null @@ -1,82 +0,0 @@ ---- src/ui/xfmail.cpp.orig 2011-09-06 15:08:01.000000000 +0200 -+++ src/ui/xfmail.cpp 2011-09-06 15:28:40.000000000 +0200 -@@ -42,6 +42,70 @@ - #include "addrbook_util.h" - #include "tip.h" - -+ -+/* -+ * This belongs to xforms' implementation -+ */ -+enum { -+ FLI_FIND_INPUT, -+ FLI_FIND_AUTOMATIC, -+ FLI_FIND_MOUSE, -+ FLI_FIND_CANVAS, -+ FLI_FIND_KEYSPECIAL, -+ FLI_FIND_RETURN -+}; -+ -+FL_OBJECT * -+fli_find_object( FL_OBJECT * obj, -+ int find, -+ FL_Coord mx, -+ FL_Coord my ) -+{ -+ while ( obj ) -+ { -+ if ( obj->objclass != FL_BEGIN_GROUP -+ && obj->objclass != FL_END_GROUP -+ && obj->visible -+ && ( obj->active -+ || ( obj->posthandle && ! obj->active ) -+ || ( obj->tooltip && *obj->tooltip && ! obj->active ) ) ) -+ { -+ if ( find == FLI_FIND_INPUT && obj->input && obj->active ) -+ return obj; -+ -+ if ( find == FLI_FIND_AUTOMATIC && obj->automatic ) -+ return obj; -+ -+ if ( find == FLI_FIND_RETURN && obj->type == FL_RETURN_BUTTON ) -+ return obj; -+ -+ if ( find == FLI_FIND_MOUSE -+ && mx >= obj->x -+ && mx <= obj->x + obj->w -+ && my >= obj->y -+ && my <= obj->y + obj->h ) -+ return obj; -+ -+ if ( find == FLI_FIND_KEYSPECIAL && obj->wantkey & FL_KEY_SPECIAL ) -+ return obj; -+ } -+ -+ obj = obj->next; -+ } -+ -+ return NULL; -+} -+ -+ -+FL_OBJECT * -+fli_find_first( FL_FORM * form, -+ int find, -+ FL_Coord mx, -+ FL_Coord my ) -+{ -+ return fli_find_object( form->first, find, mx, my ); -+} -+ - static void usage(char *s, int die) { - char **q = helps; - -@@ -486,7 +550,7 @@ - break; - - case FL_MOUSE: -- obj = fl_find_first(main_form, FL_FIND_MOUSE, mx, my); -+ obj = fli_find_first(main_form, FLI_FIND_MOUSE, mx, my); - - switch(dragndrop) { - case -1: |