View Issue Details

Jump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0001394Pluginspublic2010-05-25 22:112010-06-13 07:01
Reporterigor_yudincev Assigned Toalexy  
PrioritynormalSeveritymajorReproducibilityalways
Status closedResolutionfixed 
Platformx64OSWindowsOS Version7
Product Version2.0 
Fixed in Version2.0 
Summary0001394: Размеры меню не соответствуют окну Far
DescriptionЕсли Far запущен с ключом /w, ширина и высота меню плагина рассчитываются, исходя из размеров консольного буфера вместо видимых размеров окна.
Additional InformationFar Manager, version 2.0 (build 1571) x86
TagsNo tags attached.

Activities

vskirdin

2010-05-26 06:59

administrator   bugnote:0005412

Может имелось ввиду ключ /w, а не /x?

igor_yudincev

2010-05-26 10:26

reporter   bugnote:0005418

да, перепутал — именно /w.

vskirdin

2010-05-26 11:56

administrator   bugnote:0005422

исправил в "подробностях" ключ

igor_yudincev

2010-06-10 21:40

reporter  

build25.patch (7,033 bytes)    
Index: MacroDiff.cpp
===================================================================
--- MacroDiff.cpp	(revision 4760)
+++ MacroDiff.cpp	(working copy)
@@ -68,7 +68,7 @@
     case DN_RESIZECONSOLE:
     {
       COORD coord=(*(COORD*)Param2);
-      Macro->csbi.dwSize=coord;
+      Macro->ConsoleSize=coord;
 //      Macro->SaveBar=Info.SaveScreen(0,0,-1,-1);
       Macro->WriteKeyBar(KB_COMMON);
       Macro->FillMenu(hDlg,FALSE);
@@ -1043,6 +1043,20 @@
   }
 }
 
+void __fastcall TMacroView::ReadConsoleSize()
+{
+  SMALL_RECT console_rect;
+  if (Info.AdvControl(Info.ModuleNumber,ACTL_GETFARRECT,(void*)&console_rect))
+  {
+    ConsoleSize.X=console_rect.Right-console_rect.Left+1;
+    ConsoleSize.Y=console_rect.Bottom-console_rect.Top+1;
+  }
+  else
+  {
+    ConsoleSize.X=80;
+    ConsoleSize.Y=25;
+  }
+}
 
 void __fastcall TMacroView::InitMacroAreas()
 {
@@ -1257,7 +1271,7 @@
   EditX1=EditY1=EditX2=EditY2=0;
   *Group=*Key=0;
 
-  GetConsoleScreenBufferInfo(hOut,&csbi);
+  ReadConsoleSize();
   ReadConfig();
 
   if (MacroData)
@@ -1304,12 +1318,12 @@
 void __fastcall TMacroView::WriteKeyBar(int kbType)
 {
   SMALL_RECT rect;
-  GetConsoleScreenBufferInfo(hOut,&csbi);
+  ReadConsoleSize();
 
   if (MenuDlg)
   {
     Info.SendDlgMessage(MenuDlg,DM_GETDLGRECT,0,(LONG_PTR)&rect);
-    if (rect.Bottom>=csbi.dwSize.Y-1)
+    if (rect.Bottom>=ConsoleSize.Y-1)
       return;
     if (HelpActivated)
       return;
@@ -1317,13 +1331,13 @@
   if (EditDlg)
   {
     Info.SendDlgMessage(EditDlg,DM_GETDLGRECT,0,(LONG_PTR)&rect);
-    if (rect.Bottom>=csbi.dwSize.Y-1)
+    if (rect.Bottom>=ConsoleSize.Y-1)
       return;
     if (HelpActivated)
       return;
   }
-  if ((csbi.dwCursorPosition.Y==csbi.dwSize.Y-1) && (OpenFrom==OPEN_PLUGINSMENU))
-    return;
+  //if ((csbi.dwCursorPosition.Y==csbi.dwSize.Y-1) && (OpenFrom==OPEN_PLUGINSMENU))
+  //  return;
 
   TCHAR *KeyBarCommon[12]={GetMsg(MMacroKBHelp),
     GetMsg(MMacroKBSave),NULL,GetMsg(MMacroKBEdit),
@@ -1364,7 +1378,7 @@
   TCHAR *KeyBar[12];
 
   //������ ������ ������ �������
-  //int ScrWidth=csbi.dwSize.X+1;
+  //int ScrWidth=ConsoleSize.X+1;
 
   switch(kbType)
   {
@@ -1389,18 +1403,18 @@
   }
 
   int i,j,k;
-  CHAR_INFO *chi=new CHAR_INFO[csbi.dwSize.X];
+  CHAR_INFO *chi=new CHAR_INFO[ConsoleSize.X];
 
   COORD Size,Coord;
   SMALL_RECT Region;
-  Size.X=csbi.dwSize.X;
+  Size.X=ConsoleSize.X;
   Size.Y=1;
   Coord.X=0;
   Coord.Y=0;
   Region.Left=0;
-  Region.Top=csbi.dwSize.Y-1;
-  Region.Right=csbi.dwSize.X-1;
-  Region.Bottom=csbi.dwSize.Y-1;
+  Region.Top=ConsoleSize.Y-1;
+  Region.Right=ConsoleSize.X-1;
+  Region.Bottom=ConsoleSize.Y-1;
 
   ReadConsoleOutput(hOut,chi,Size,Coord,&Region);
 
@@ -1413,12 +1427,12 @@
 #endif
   if (chi[0].Char._CH==_T('1') && chi[0].Attributes==ColDigit && chi[1].Attributes==ColText)
   {
-    for (i=0,j=1;j<csbi.dwSize.X;i++)
+    for (i=0,j=1;j<ConsoleSize.X;i++)
     {
       if (KeyBar[i] && *KeyBar[i])
       {
         k=0;
-        while (chi[j].Attributes==ColText && j<csbi.dwSize.X)
+        while (chi[j].Attributes==ColText && j<ConsoleSize.X)
         {
           if (KeyBar[i][k]!=0)
             chi[j++].Char._CH=KeyBar[i][k++];
@@ -1428,14 +1442,14 @@
       }
       else
       {
-        while (chi[j].Attributes==ColText && j<csbi.dwSize.X)
+        while (chi[j].Attributes==ColText && j<ConsoleSize.X)
         {
           chi[j++].Char._CH=_T(' ');
         }
       }
 #undef _CH
 
-      while(chi[j].Attributes!=ColText && j<csbi.dwSize.X)
+      while(chi[j].Attributes!=ColText && j<ConsoleSize.X)
         j++;
     }
 
@@ -2706,7 +2720,7 @@
         CheckLen(Str,KeyWidth);
         lstrcat(Str,_T(":"));
         FSF.sprintf(S,_T("%-*s  \"%s\""),KeyWidth+1,Str,(Key[0]==_T('~') && lstrlen(Key)>1)?&Key[1]:Key);
-        CheckLen(S,(csbi.dwSize.X-12>MAXMENULEN) ? MAXMENULEN : csbi.dwSize.X-12);
+        CheckLen(S,(ConsoleSize.X-12>MAXMENULEN) ? MAXMENULEN : ConsoleSize.X-12);
         if (Key[0]==_T('~') && lstrlen(Key)>1)
         {
           Str[0]=_T('~');
@@ -2795,7 +2809,7 @@
           ListItems/*[i]*/.Flags=(S[0]==_T('~'))?LIF_CHECKED|_T('-'):0;
           if (S[0]==_T('~'))
             memmove(S,&S[1],sizeof(S)-sizeof(S[0]));
-          CheckLen(S,(csbi.dwSize.X-12>MAXMENULEN)?MAXMENULEN:csbi.dwSize.X-12);
+          CheckLen(S,(ConsoleSize.X-12>MAXMENULEN)?MAXMENULEN:ConsoleSize.X-12);
 #ifndef UNICODE
           lstrcpy(ListItems/*[i]*/.Text,S);
 #else
@@ -2849,8 +2863,8 @@
     ListPos.TopPos=TopPos;
   }
 
-  MenuW=(MaxMenuItemLen+8>csbi.dwSize.X)?csbi.dwSize.X-10:MaxMenuItemLen+8;
-  MenuH=(MenuItemsNumber+10>csbi.dwSize.Y)?csbi.dwSize.Y-6:MenuItemsNumber+4;
+  MenuW=(MaxMenuItemLen+8>ConsoleSize.X)?ConsoleSize.X-10:MaxMenuItemLen+8;
+  MenuH=(MenuItemsNumber+10>ConsoleSize.Y)?ConsoleSize.Y-6:MenuItemsNumber+4;
   if (MenuH<5)
     MenuH=5;
 
@@ -2871,8 +2885,8 @@
 
 /*  if (MenuX==-1 && MenuY==-1) // MenuX � MenuY ���� -1, ����� ����� ���� � ������ �����������.
   {
-    MenuX=(csbi.dwSize.X-MenuW)/2;
-    MenuY=(csbi.dwSize.Y-MenuH)/2;
+    MenuX=(ConsoleSize.X-MenuW)/2;
+    MenuY=(ConsoleSize.Y-MenuH)/2;
   }*/
 
   Coord.X=MenuX;
@@ -3318,8 +3332,8 @@
   ActiveMode=MAC_EDITACTIVE;
   EditMode=EM_INSERT;
 
-  EditX1=(csbi.dwSize.X-DIALOGWID)/2;
-  EditY1=(csbi.dwSize.Y-1-DIALOGHGT)/2;
+  EditX1=(ConsoleSize.X-DIALOGWID)/2;
+  EditY1=(ConsoleSize.Y-1-DIALOGHGT)/2;
   EditX2=EditX1+DIALOGWID-1;
   EditY2=EditY1+DIALOGHGT-1;
 
@@ -3786,8 +3800,8 @@
       ActiveMode=MAC_EDITACTIVE;
       EditMode=EM_EDIT;
 
-      EditX1=(csbi.dwSize.X-DIALOGWID)/2;
-      EditY1=(csbi.dwSize.Y-1-DIALOGHGT)/2;
+      EditX1=(ConsoleSize.X-DIALOGWID)/2;
+      EditY1=(ConsoleSize.Y-1-DIALOGHGT)/2;
       EditX2=EditX1+DIALOGWID-1;
       EditY2=EditY1+DIALOGHGT-1;
 
Index: MacroView.hpp
===================================================================
--- MacroView.hpp	(revision 4760)
+++ MacroView.hpp	(working copy)
@@ -243,7 +243,7 @@
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
     WIN32_FIND_DATA fData;
-    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    COORD ConsoleSize;
 
     TCHAR         S[MAX_PATH_LEN],
                   Str[MAX_PATH_LEN],
@@ -319,6 +319,7 @@
     void          __fastcall SetFocus(int Focus);
     BOOL          __fastcall InsertMacro();
     BOOL          __fastcall EditMacro();
+    void          __fastcall ReadConsoleSize();
 };
 
 TReg *Reg=NULL;
Index: MacroView.rc
===================================================================
--- MacroView.rc	(revision 4760)
+++ MacroView.rc	(working copy)
@@ -1,6 +1,6 @@
 #include "farversion.hpp"
 
-#define PLUGIN_BUILD 24
+#define PLUGIN_BUILD 25
 #define PLUGIN_DESC "Macro browser for FAR Manager"
 #define PLUGIN_NAME "MacroView"
 #define PLUGIN_FILENAME "MacroView.dll"
build25.patch (7,033 bytes)   

igor_yudincev

2010-06-10 21:41

reporter   bugnote:0005461

выкладываю патч.

alexy

2010-06-11 16:21

administrator   bugnote:0005471

Плагин должен собиратся и для 1.75, это в патче не учтено - в 1.75 нету ACTL_GETFARRECT. Нужно скомбинировать старый код получения размера с новым.

igor_yudincev

2010-06-11 21:29

reporter  

update25.patch (7,080 bytes)    
Index: MacroDiff.cpp
===================================================================
--- MacroDiff.cpp	(revision 4760)
+++ MacroDiff.cpp	(working copy)
@@ -68,7 +68,7 @@
     case DN_RESIZECONSOLE:
     {
       COORD coord=(*(COORD*)Param2);
-      Macro->csbi.dwSize=coord;
+      Macro->ConsoleSize=coord;
 //      Macro->SaveBar=Info.SaveScreen(0,0,-1,-1);
       Macro->WriteKeyBar(KB_COMMON);
       Macro->FillMenu(hDlg,FALSE);
@@ -1043,6 +1043,27 @@
   }
 }
 
+void __fastcall TMacroView::ReadConsoleSize()
+{
+  SHORT x=80, y=25;
+#ifndef UNICODE
+  CONSOLE_SCREEN_BUFFER_INFO csbi;
+  if (GetConsoleScreenBufferInfo(hOut,&csbi))
+  {
+    x=csbi.dwSize.X;
+    y=csbi.dwSize.Y;
+  }
+#else
+  SMALL_RECT console_rect;
+  if (Info.AdvControl(Info.ModuleNumber,ACTL_GETFARRECT,(void*)&console_rect))
+  {
+    x=console_rect.Right-console_rect.Left+1;
+    y=console_rect.Bottom-console_rect.Top+1;
+  }
+#endif
+  ConsoleSize.X=x;
+  ConsoleSize.Y=y;
+}
 
 void __fastcall TMacroView::InitMacroAreas()
 {
@@ -1257,7 +1278,7 @@
   EditX1=EditY1=EditX2=EditY2=0;
   *Group=*Key=0;
 
-  GetConsoleScreenBufferInfo(hOut,&csbi);
+  ReadConsoleSize();
   ReadConfig();
 
   if (MacroData)
@@ -1304,12 +1325,12 @@
 void __fastcall TMacroView::WriteKeyBar(int kbType)
 {
   SMALL_RECT rect;
-  GetConsoleScreenBufferInfo(hOut,&csbi);
+  ReadConsoleSize();
 
   if (MenuDlg)
   {
     Info.SendDlgMessage(MenuDlg,DM_GETDLGRECT,0,(LONG_PTR)&rect);
-    if (rect.Bottom>=csbi.dwSize.Y-1)
+    if (rect.Bottom>=ConsoleSize.Y-1)
       return;
     if (HelpActivated)
       return;
@@ -1317,13 +1338,11 @@
   if (EditDlg)
   {
     Info.SendDlgMessage(EditDlg,DM_GETDLGRECT,0,(LONG_PTR)&rect);
-    if (rect.Bottom>=csbi.dwSize.Y-1)
+    if (rect.Bottom>=ConsoleSize.Y-1)
       return;
     if (HelpActivated)
       return;
   }
-  if ((csbi.dwCursorPosition.Y==csbi.dwSize.Y-1) && (OpenFrom==OPEN_PLUGINSMENU))
-    return;
 
   TCHAR *KeyBarCommon[12]={GetMsg(MMacroKBHelp),
     GetMsg(MMacroKBSave),NULL,GetMsg(MMacroKBEdit),
@@ -1364,7 +1383,7 @@
   TCHAR *KeyBar[12];
 
   //������ ������ ������ �������
-  //int ScrWidth=csbi.dwSize.X+1;
+  //int ScrWidth=ConsoleSize.X+1;
 
   switch(kbType)
   {
@@ -1389,18 +1408,18 @@
   }
 
   int i,j,k;
-  CHAR_INFO *chi=new CHAR_INFO[csbi.dwSize.X];
+  CHAR_INFO *chi=new CHAR_INFO[ConsoleSize.X];
 
   COORD Size,Coord;
   SMALL_RECT Region;
-  Size.X=csbi.dwSize.X;
+  Size.X=ConsoleSize.X;
   Size.Y=1;
   Coord.X=0;
   Coord.Y=0;
   Region.Left=0;
-  Region.Top=csbi.dwSize.Y-1;
-  Region.Right=csbi.dwSize.X-1;
-  Region.Bottom=csbi.dwSize.Y-1;
+  Region.Top=ConsoleSize.Y-1;
+  Region.Right=ConsoleSize.X-1;
+  Region.Bottom=ConsoleSize.Y-1;
 
   ReadConsoleOutput(hOut,chi,Size,Coord,&Region);
 
@@ -1413,12 +1432,12 @@
 #endif
   if (chi[0].Char._CH==_T('1') && chi[0].Attributes==ColDigit && chi[1].Attributes==ColText)
   {
-    for (i=0,j=1;j<csbi.dwSize.X;i++)
+    for (i=0,j=1;j<ConsoleSize.X;i++)
     {
       if (KeyBar[i] && *KeyBar[i])
       {
         k=0;
-        while (chi[j].Attributes==ColText && j<csbi.dwSize.X)
+        while (chi[j].Attributes==ColText && j<ConsoleSize.X)
         {
           if (KeyBar[i][k]!=0)
             chi[j++].Char._CH=KeyBar[i][k++];
@@ -1428,14 +1447,14 @@
       }
       else
       {
-        while (chi[j].Attributes==ColText && j<csbi.dwSize.X)
+        while (chi[j].Attributes==ColText && j<ConsoleSize.X)
         {
           chi[j++].Char._CH=_T(' ');
         }
       }
 #undef _CH
 
-      while(chi[j].Attributes!=ColText && j<csbi.dwSize.X)
+      while(chi[j].Attributes!=ColText && j<ConsoleSize.X)
         j++;
     }
 
@@ -2706,7 +2725,7 @@
         CheckLen(Str,KeyWidth);
         lstrcat(Str,_T(":"));
         FSF.sprintf(S,_T("%-*s  \"%s\""),KeyWidth+1,Str,(Key[0]==_T('~') && lstrlen(Key)>1)?&Key[1]:Key);
-        CheckLen(S,(csbi.dwSize.X-12>MAXMENULEN) ? MAXMENULEN : csbi.dwSize.X-12);
+        CheckLen(S,(ConsoleSize.X-12>MAXMENULEN) ? MAXMENULEN : ConsoleSize.X-12);
         if (Key[0]==_T('~') && lstrlen(Key)>1)
         {
           Str[0]=_T('~');
@@ -2795,7 +2814,7 @@
           ListItems/*[i]*/.Flags=(S[0]==_T('~'))?LIF_CHECKED|_T('-'):0;
           if (S[0]==_T('~'))
             memmove(S,&S[1],sizeof(S)-sizeof(S[0]));
-          CheckLen(S,(csbi.dwSize.X-12>MAXMENULEN)?MAXMENULEN:csbi.dwSize.X-12);
+          CheckLen(S,(ConsoleSize.X-12>MAXMENULEN)?MAXMENULEN:ConsoleSize.X-12);
 #ifndef UNICODE
           lstrcpy(ListItems/*[i]*/.Text,S);
 #else
@@ -2849,8 +2868,8 @@
     ListPos.TopPos=TopPos;
   }
 
-  MenuW=(MaxMenuItemLen+8>csbi.dwSize.X)?csbi.dwSize.X-10:MaxMenuItemLen+8;
-  MenuH=(MenuItemsNumber+10>csbi.dwSize.Y)?csbi.dwSize.Y-6:MenuItemsNumber+4;
+  MenuW=(MaxMenuItemLen+8>ConsoleSize.X)?ConsoleSize.X-10:MaxMenuItemLen+8;
+  MenuH=(MenuItemsNumber+10>ConsoleSize.Y)?ConsoleSize.Y-6:MenuItemsNumber+4;
   if (MenuH<5)
     MenuH=5;
 
@@ -2871,8 +2890,8 @@
 
 /*  if (MenuX==-1 && MenuY==-1) // MenuX � MenuY ���� -1, ����� ����� ���� � ������ �����������.
   {
-    MenuX=(csbi.dwSize.X-MenuW)/2;
-    MenuY=(csbi.dwSize.Y-MenuH)/2;
+    MenuX=(ConsoleSize.X-MenuW)/2;
+    MenuY=(ConsoleSize.Y-MenuH)/2;
   }*/
 
   Coord.X=MenuX;
@@ -3318,8 +3337,8 @@
   ActiveMode=MAC_EDITACTIVE;
   EditMode=EM_INSERT;
 
-  EditX1=(csbi.dwSize.X-DIALOGWID)/2;
-  EditY1=(csbi.dwSize.Y-1-DIALOGHGT)/2;
+  EditX1=(ConsoleSize.X-DIALOGWID)/2;
+  EditY1=(ConsoleSize.Y-1-DIALOGHGT)/2;
   EditX2=EditX1+DIALOGWID-1;
   EditY2=EditY1+DIALOGHGT-1;
 
@@ -3786,8 +3805,8 @@
       ActiveMode=MAC_EDITACTIVE;
       EditMode=EM_EDIT;
 
-      EditX1=(csbi.dwSize.X-DIALOGWID)/2;
-      EditY1=(csbi.dwSize.Y-1-DIALOGHGT)/2;
+      EditX1=(ConsoleSize.X-DIALOGWID)/2;
+      EditY1=(ConsoleSize.Y-1-DIALOGHGT)/2;
       EditX2=EditX1+DIALOGWID-1;
       EditY2=EditY1+DIALOGHGT-1;
 
Index: MacroView.hpp
===================================================================
--- MacroView.hpp	(revision 4760)
+++ MacroView.hpp	(working copy)
@@ -243,7 +243,7 @@
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
     WIN32_FIND_DATA fData;
-    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    COORD ConsoleSize;
 
     TCHAR         S[MAX_PATH_LEN],
                   Str[MAX_PATH_LEN],
@@ -319,6 +319,7 @@
     void          __fastcall SetFocus(int Focus);
     BOOL          __fastcall InsertMacro();
     BOOL          __fastcall EditMacro();
+    void          __fastcall ReadConsoleSize();
 };
 
 TReg *Reg=NULL;
Index: MacroView.rc
===================================================================
--- MacroView.rc	(revision 4760)
+++ MacroView.rc	(working copy)
@@ -1,6 +1,6 @@
 #include "farversion.hpp"
 
-#define PLUGIN_BUILD 24
+#define PLUGIN_BUILD 25
 #define PLUGIN_DESC "Macro browser for FAR Manager"
 #define PLUGIN_NAME "MacroView"
 #define PLUGIN_FILENAME "MacroView.dll"
update25.patch (7,080 bytes)   

igor_yudincev

2010-06-11 21:30

reporter   bugnote:0005473

добавил исправленный патч.

alexy

2010-06-12 13:47

administrator   bugnote:0005475

build 25

Issue History

Date Modified Username Field Change
2010-05-25 22:11 igor_yudincev New Issue
2010-05-26 06:59 vskirdin Note Added: 0005412
2010-05-26 10:26 igor_yudincev Note Added: 0005418
2010-05-26 11:56 vskirdin Note Added: 0005422
2010-05-26 11:56 vskirdin Description Updated
2010-06-10 21:40 igor_yudincev File Added: build25.patch
2010-06-10 21:41 igor_yudincev Note Added: 0005461
2010-06-11 16:21 alexy Note Added: 0005471
2010-06-11 21:29 igor_yudincev File Added: update25.patch
2010-06-11 21:30 igor_yudincev Note Added: 0005473
2010-06-12 13:47 alexy Note Added: 0005475
2010-06-12 13:47 alexy Assigned To => alexy
2010-06-12 13:47 alexy Status new => feedback
2010-06-12 23:33 igor_yudincev Status feedback => resolved
2010-06-13 07:01 alexy Status resolved => closed
2010-06-13 07:01 alexy Resolution open => fixed
2010-06-13 07:01 alexy Fixed in Version => 2.0
2013-05-20 21:38 alexy Category MacroView => (No Category)