closeTabNoPrompt.diff

   1 From: Tony Balinski <ajbj@free.fr>
   2 Subject: Close without prompting if close-tab button pressed with Shift or Control
   3
   4 ---
   5
   6  source/window.c |   18 +++++++++++++++---
   7  1 file changed, 15 insertions(+), 3 deletions(-)
   8
   9 diff --quilt old/source/window.c new/source/window.c
  10 --- old/source/window.c
  11 +++ new/source/window.c
  12 @@ -159,7 +159,7 @@ static int getTabPosition(Widget tab);
  13  static Widget manageToolBars(Widget toolBarsForm);
  14  static void hideTearOffs(Widget menuPane);
  15  static void CloseDocumentWindow(Widget w, WindowInfo *window, XtPointer callData);
  16 -static void closeTabCB(Widget w, Widget mainWin, caddr_t callData);
  17 +static void closeTabCB(Widget w, Widget mainWin, XmAnyCallbackStruct *callData);
  18  static void raiseTabCB(Widget w, XtPointer clientData, XtPointer callData);
  19  static Widget createTextArea(Widget parent, WindowInfo *window, int rows,
  20          int cols, int emTabDist, char *delimiters, int wrapMargin,
  21 @@ -4937,10 +4937,15 @@ static void closeTabProc(XtPointer clien
  22      CloseFileAndWindow((WindowInfo*)clientData, PROMPT_SBC_DIALOG_RESPONSE);
  23  }
  24
  25 +static void closeTabNoSaveProc(XtPointer clientData, XtIntervalId *id)
  26 +{
  27 +    CloseFileAndWindow((WindowInfo*)clientData, NO_SBC_DIALOG_RESPONSE);
  28 +}
  29 +
  30  /*
  31  ** callback to close-tab button.
  32  */
  33 -static void closeTabCB(Widget w, Widget mainWin, caddr_t callData)
  34 +static void closeTabCB(Widget w, Widget mainWin, XmAnyCallbackStruct *callData)
  35  {
  36      /* FIXME: XtRemoveActionHook() related coredump
  37
  38 @@ -4959,8 +4964,15 @@ static void closeTabCB(Widget w, Widget
  39         While its actual mechanism is not well understood, we somehow
  40         managed to workaround the bug by delaying the action of closing
  41         the tab. For now. */
  42 +
  43 +    XtTimerCallbackProc pCloseTabProc = closeTabProc;
  44 +
  45 +    /* don't prompt for save if the Ctrl or Shift key was pressed */
  46 +    if (callData->event->xbutton.state & (ShiftMask | ControlMask))
  47 +        pCloseTabProc = closeTabNoSaveProc;
  48 +
  49      XtAppAddTimeOut(XtWidgetToApplicationContext(w), 0,
  50 -           closeTabProc, GetTopDocument(mainWin));
  51 +            pCloseTabProc, GetTopDocument(mainWin));
  52  }
  53
  54  /*