improve multiple monitors config

Author: Olivier Butler

data/po/fr/strings.po

@@ -130,7 +130,7 @@ msgid ""
 "in speaks my language. Otherwise the ground crew speaks English\n"
 "with a local accent."
 msgstr ""
-"Le personnel au sol parle francais uniquement dans le pays francophones.\n"
+"Le personnel au sol parle francais uniquement dans les pays francophones.\n"
 "Sinon, Le personnel au sol parle anglais avec un accent local pour certains."
 
 msgid ""
@@ -237,3 +237,42 @@ msgid "Hides default X-Plane 11 pushback tug.\n"
 msgstr "Cache le tracteur par defaut de X-Plane 11.\n"
     "Relancer X-Plane pour que le changement prenne effet."
 
+msgid "In case of multiple monitors configuration, BpB need to use the primary monitor\n"
+        "(the one with the x-plane menus), Bpb is able to select it automatically.\n"
+        "If not select the one that works ! (the monitor numbers are arbitrary)."
+msgstr "Dans le cas d'une configuration avec plusieurs ecrans, BpB doit utiliser l'ecran principal\n"
+        "(celui avec les menus de x-plane), Bpb est capable de le selectionner automatiquement.\n"
+        "Si ce n'est pas le cas, selectionner celui qui fonctionne ! (La numerotation des ecrans est arbitraire)."
+
+msgid "User interface on monitor #"
+msgstr "Interface sur l'ecran n°"
+
+msgid "Automatic"
+msgstr "Automatique"
+
+msgid "Monitor #0"
+msgstr "Ecran n°0"
+
+msgid "Monitor #1"
+msgstr "Ecran n°1"
+
+msgid "Monitor #2"
+msgstr "Ecran n°2"
+
+msgid "Monitor #3"
+msgstr "Ecran n°3"
+
+msgid "Monitor #4"
+msgstr "Ecran n°4"
+
+msgid "Monitor #5"
+msgstr "Ecran n°5"
+
+msgid "Magic squares position **"
+msgstr "Position des raccourcis **"
+
+msgid "Slide this bar to move the magic squares up or down"
+msgstr "Glisser cette barre pour monter ou descendre les miniatures-raccourcis"
+
+msgid "Hide default X-Plane 11 tug"
+msgstr "Cache le tracteur par defaut de X-plane"

data/po/strings.pot

@@ -205,4 +205,39 @@ msgid "Don't check the doors and hatches status before starting the push-back"
 msgstr ""
 
 msgid "Ignore doors and hatches check **"
-msgstr ""
+msgstr ""
+
+msgid "In case of multiple monitors configuration, BpB need to use the primary monitor\n"
+        "(the one with the x-plane menus), Bpb is able to select it automatically.\n"
+        "If not select the one that works ! (the monitor numbers are arbitrary)."
+msgstr ""
+
+msgid "User interface on monitor #"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid ""Monitor #0"
+msgstr ""
+
+msgid ""Monitor #1"
+msgstr ""
+
+msgid ""Monitor #2"
+msgstr ""
+
+msgid ""Monitor #3"
+msgstr ""
+
+msgid ""Monitor #4"
+msgstr ""
+
+msgid ""Monitor #5"
+msgstr ""
+
+msgid "Magic squares position **"
+msgstr ""
+
+msgid "Slide this bar to move the magic squares up or down"
+msgid ""

src/bp.c

@@ -190,7 +190,7 @@ static void disco_intf_hide(void);
 
 static void main_intf_show(void);
 
-static void main_intf_hide(void);
+void main_intf_hide(void);
 
 static int disco_handler(XPLMCommandRef, XPLMCommandPhase, void *);
 
@@ -2454,7 +2454,6 @@ disco_win_draw(XPLMWindowID inWindowID, void *inRefcon) {
     int w, h, mx, my;
 
     UNUSED(inRefcon);
-//    BPGetScreenSizeUIScaled(&w, &h, B_FALSE);
     h = monitor_def.h;
     w = monitor_def.w;
     XPLMGetMouseLocationGlobal(&mx, &my);
@@ -2569,7 +2568,6 @@ disco_intf_show(void) {
     int w, h;
 
     initMonitorOrigin();
-//    BPGetScreenSizeUIScaled(&w, &h, B_TRUE);
     h = monitor_def.h;
     w = monitor_def.w;
 
@@ -2621,32 +2619,29 @@ main_win_click(XPLMWindowID inWindowID, int x, int y, XPLMMouseStatus inMouse,
 
 static void
 main_win_draw(XPLMWindowID inWindowID, void *inRefcon) {
-    int h, mx, my;
+    int mx, my;
 
     UNUSED(inRefcon);
-//    BPGetScreenSizeUIScaled(&w, &h, B_FALSE);
-    h = monitor_def.h;
-    //w = monitor_def.w;
 
     XPLMGetMouseLocationGlobal(&mx, &my);
 
     XPLMSetGraphicsState(0, 1, 0, 0, 1, 0, 0);
     if (inWindowID == bp_ls.planner_win) {
         bool_t is_lit = (mx >= monitor_def.x_origin &&
                          mx <= monitor_def.x_origin + disco_buttons[2].w &&
-                         my >= monitor_def.y_origin + h/2 - disco_buttons[2].h &&
-                         my <= monitor_def.y_origin + h/2 );
+                         my >= monitor_def.y_origin + monitor_def.magic_squares_height - disco_buttons[2].h &&
+                         my <= monitor_def.y_origin + monitor_def.magic_squares_height );
         draw_icon(&disco_buttons[2], monitor_def.x_origin,
-                  monitor_def.y_origin + h/2 - disco_buttons[2].h, 1.0,
+                  monitor_def.y_origin + monitor_def.magic_squares_height - disco_buttons[2].h, 1.0,
                   B_FALSE, is_lit);
     } else {
         bool_t is_lit = (mx >= monitor_def.x_origin &&
                          mx <= monitor_def.x_origin + disco_buttons[3].w &&
-                         my >= monitor_def.y_origin + h/2 - 1.5 * disco_buttons[2].h - disco_buttons[3].h &&
-                         my <= monitor_def.y_origin + h/2 - 1.5 * disco_buttons[2].h);
+                         my >= monitor_def.y_origin + monitor_def.magic_squares_height - 1.5 * disco_buttons[2].h - disco_buttons[3].h &&
+                         my <= monitor_def.y_origin + monitor_def.magic_squares_height - 1.5 * disco_buttons[2].h);
         ASSERT(inWindowID == bp_ls.start_pb_win);
         draw_icon(&disco_buttons[3], monitor_def.x_origin,
-                  monitor_def.y_origin + h/2 - 1.5 * disco_buttons[2].h - disco_buttons[3].h, 1.0,
+                  monitor_def.y_origin + monitor_def.magic_squares_height - 1.5 * disco_buttons[2].h - disco_buttons[3].h, 1.0,
                   B_FALSE, is_lit);
     }
 }
@@ -2664,21 +2659,15 @@ main_intf_show(void) {
                 .handleMouseWheelFunc = nil_win_wheel,
                 .refcon = NULL
         };
-        int h;
         initMonitorOrigin();
-        //BPGetScreenSizeUIScaled(&w, &h, B_TRUE);
-        h = monitor_def.h;
-        //w = monitor_def.w;
-
 
-        logMsg("Orign x %d y %d",monitor_def.x_origin,monitor_def.y_origin );
 
     if (bp_ls.planner_win == NULL)  {
         load_icon(&disco_buttons[2]);
         disco_ops.left = monitor_def.x_origin ; // w / 2 - 1.5 * disco_buttons[0].w;
         disco_ops.right = monitor_def.x_origin  + disco_buttons[2].w;
-        disco_ops.top = monitor_def.y_origin + h/2 ; // - 0.5 * disco_buttons[0].h;
-        disco_ops.bottom = monitor_def.y_origin + h/2 - disco_buttons[2].h;
+        disco_ops.top = monitor_def.y_origin + monitor_def.magic_squares_height ; // - 0.5 * disco_buttons[0].h;
+        disco_ops.bottom = monitor_def.y_origin + monitor_def.magic_squares_height - disco_buttons[2].h;
         bp_ls.planner_win = XPLMCreateWindowEx(&disco_ops);
         ASSERT(bp_ls.planner_win != NULL);
         XPLMBringWindowToFront(bp_ls.planner_win);
@@ -2688,7 +2677,7 @@ main_intf_show(void) {
         load_icon(&disco_buttons[3]);
         disco_ops.left = monitor_def.x_origin ; //w / 2 + 0.5 * disco_buttons[1].w;
         disco_ops.right = monitor_def.x_origin  + disco_buttons[3].w;
-        disco_ops.top = monitor_def.y_origin + h/2 - 1.5 * disco_buttons[2].h;
+        disco_ops.top = monitor_def.y_origin + monitor_def.magic_squares_height - 1.5 * disco_buttons[2].h;
         disco_ops.bottom = monitor_def.y_origin + disco_ops.top - disco_buttons[3].h;
         bp_ls.start_pb_win = XPLMCreateWindowEx(&disco_ops);
         ASSERT(bp_ls.start_pb_win != NULL);
@@ -2697,7 +2686,7 @@ main_intf_show(void) {
     }
 }
 
-static void
+void
 main_intf_hide(void) {
     if (bp_ls.planner_win != NULL) {
         XPLMDestroyWindow(bp_ls.planner_win);
@@ -2713,7 +2702,8 @@ main_intf_hide(void) {
 
 void
 main_intf(void) {
-    if (acf_is_airliner() && acf_on_gnd_stopped(NULL) && (start_pb_plan_enable == B_TRUE) && (start_pb_enable == B_TRUE)) {
+    if (get_pref_widget_status() // show also the magic button while in the pref window
+     || (acf_is_airliner() && acf_on_gnd_stopped(NULL) && (start_pb_plan_enable == B_TRUE) && (start_pb_enable == B_TRUE))) {
         main_intf_show();
     } else {
         main_intf_hide();

src/bp.h

@@ -192,6 +192,8 @@ bool_t audio_sys_init(void);
 
 void main_intf(void);
 
+void main_intf_hide(void);
+
 extern bool_t late_plan_requested;
 
 #ifdef    __cplusplus

src/bp_cam.c

@@ -376,15 +376,11 @@ move_camera(XPLMCommandRef cmd, XPLMCommandPhase phase, void *refcon) {
 
 static void
 get_vp(vec4 vp) {
-///    int scr_w, scr_h;
 
     ASSERT(vp != NULL);
-        /*
-         * As fake_win is defined with 0,0 and sizes given by BPGetScreenSizeUIScaled
-         * let's do the same here. it will fix planner drawing in Xp12
-         */
-  ///      BPGetScreenSizeUIScaled(&scr_w, &scr_h, B_FALSE);
-        vp[0] = monitor_def.x_origin;
+
+
+        vp[0] =  monitor_def.x_origin;
         vp[1] =  monitor_def.y_origin;
         vp[2] =  monitor_def.w;
         vp[3] =  monitor_def.h;
@@ -848,11 +844,10 @@ fake_win_draw(XPLMWindowID inWindowID, void *inRefcon) {
     UNUSED(inWindowID);
     UNUSED(inRefcon);
 
-    //BPGetScreenSizeUIScaled(&w, &h, B_FALSE);
     h = monitor_def.h;
     w = monitor_def.w;
 
-    XPLMSetWindowGeometry(fake_win, monitor_def.x_origin, h, w, monitor_def.y_origin);
+//    XPLMSetWindowGeometry(fake_win, monitor_def.x_origin, h, w, monitor_def.y_origin);
 
     if (!XPLMIsWindowInFront(fake_win))
         XPLMBringWindowToFront(fake_win);
@@ -893,7 +888,6 @@ button_hit_check(int x, int y) {
     double scale;
     int w, h, h_buttons, h_off;
 
-//    BPGetScreenSizeUIScaled(&w, &h, B_FALSE);
     h = monitor_def.h;
     w = monitor_def.w;
 
@@ -1209,7 +1203,6 @@ bp_cam_start(void) {
 
     push_reset_fov_values();
     eye_track_debut();
-//    BPGetScreenSizeUIScaled(&fake_win_ops.right, &fake_win_ops.top, B_TRUE);
 
     initMonitorOrigin();
     fake_win_ops.left = monitor_def.x_origin;
@@ -1286,11 +1279,9 @@ bp_cam_start(void) {
 
     updateAvailable = getPluginUpdateStatus();
     if (updateAvailable != NULL) {
- //       snprintf(bottom_msg, sizeof(bottom_msg), "New version of BetterPushBack available: %s (Use SkunkCrafts Updater to update)", updateAvailable);
- //       init_bottom_msg(bottom_msg);
-    }
-        snprintf(bottom_msg, sizeof(bottom_msg), "New version of BetterPushBack available: xxxx (Use SkunkCrafts Updater to update)");
+        snprintf(bottom_msg, sizeof(bottom_msg), "New version of BetterPushBack available: %s (Use SkunkCrafts Updater to update)", updateAvailable);
         init_bottom_msg(bottom_msg);
+    }
 
     return (B_TRUE);
 }

src/cab_view.c

@@ -199,11 +199,9 @@ cam_ctl(XPLMCameraPosition_t *pos, int losing_control, void *refcon)
 static void
 win_draw(XPLMWindowID inWindowID, void *inRefcon)
 {
-//	int w, h;
 
 	UNUSED(inWindowID);
 	UNUSED(inRefcon);
-//	BPGetScreenSizeUIScaled(&w, &h, B_FALSE);
 	XPLMSetWindowGeometry(win, monitor_def.x_origin, monitor_def.h, monitor_def.w, monitor_def.y_origin);
 
 	if (hintbar != NULL && microclock() - hintbar_start > HINTBAR_TIMEOUT) {
@@ -330,7 +328,6 @@ cab_view_start(void)
 		    .handleMouseWheelFunc = win_wheel,
 		    .refcon = NULL
 		};
-//		BPGetScreenSizeUIScaled(&win_ops.right, &win_ops.top, B_TRUE);
 		win_ops.left = monitor_def.x_origin;
 		win_ops.right = monitor_def.x_origin + monitor_def.w;
 		win_ops.bottom = monitor_def.y_origin;
@@ -347,12 +344,10 @@ cab_view_start(void)
 	 */
 	if (hintbar == NULL) {
 		const char *str = _("Left mouse button to reorient view");
-//		int x, y;
 		int w = XPLMMeasureString(xplmFont_Proportional,
 		    str, strlen(str));
 		XPWidgetID caption;
 
-//		BPGetScreenSizeUIScaled(&x, &y, B_TRUE);
 		hintbar = create_widget_rel((monitor_def.w - w) / 2 - 10,
 		     HINTBAR_HEIGHT * 3, B_FALSE, w + 20,
 		    HINTBAR_HEIGHT, 0, "", 1, NULL, xpWidgetClass_MainWindow);