New upstream version 25.0.3+dfsg1

plugins/linux-capture/data/locale/fa-IR.ini

@@ -1,14 +1,15 @@
-X11SharedMemoryScreenInput="صفحه نمایش ضبط (XSHM)"
+X11SharedMemoryScreenInput="ضبط صفحه نمایش(XSHM)"
 Screen="صفحه نمایش"
-CaptureCursor="گرفتن مکان نما"
+CaptureCursor="ضبط مکان نمای ماوس"
 AdvancedSettings="تنظیمات پیشرفته"
 XServer="سرویس دهنده"
 XCCapture="ضبط پنجره (Xcomposite)"
-Window="ویندوز"
+Window="پنجره"
 CropTop="برش بالا (پیکسل)"
 CropLeft="برش چپ (پیکسل)"
 CropRight="برش راست (پیکسل)"
 CropBottom="برش پایین (پیکسل)"
+SwapRedBlue="قرمز و آبی را تعویض کنید"
 LockX="سرور اکس قفل هنگام گرفتن"
 IncludeXBorder="شامل X مرز"
 ExcludeAlpha="استفاده از فرمت های بافت آلفا کمتر (مسا حلی)"

plugins/linux-capture/data/locale/sl-SI.ini

@@ -2,14 +2,15 @@ X11SharedMemoryScreenInput="Zajemanje zaslona (XSHM)"
 Screen="Zaslon"
 CaptureCursor="Zajemi kazalec"
 AdvancedSettings="Napredne nastavitve"
-XServer="X Server"
+XServer="X strežnik"
 XCCapture="Zajemanje okna (Xcomposite)"
 Window="Okno"
-CropTop="Obreži zgoraj (pixels)"
-CropLeft="Obreži levo (pixels)"
-CropRight="Obreži desno (pixels)"
-CropBottom="Obreži spodaj (pixels)"
+CropTop="Obreži zgoraj (sl. točke)"
+CropLeft="Obreži levo (sl. točke)"
+CropRight="Obreži desno (sl. točke)"
+CropBottom="Obreži spodaj (sl. točke)"
 SwapRedBlue="Zamenjaj modro in rdečo"
-LockX="Zakleni X server med zajemanjem"
-IncludeXBorder="Vključujejo X meje"
+LockX="Zakleni X sstrežnik med zajemanjem"
+IncludeXBorder="Vključi obrobo X"
+ExcludeAlpha="Uporabi format za teksture, ki je brez alfa kanala (Mesa obvod)"
 

plugins/linux-capture/data/locale/vi-VN.ini

@@ -1,7 +1,7 @@
 X11SharedMemoryScreenInput="Quay màn hỉnh (XSHM)"
 Screen="Màn hình"
 CaptureCursor="Quay cả con trỏ"
-AdvancedSettings="Cài đặt nâng cao"
+AdvancedSettings="Thiết đặt nâng cao"
 XServer="X Server"
 XCCapture="Quay cửa sổ (Xcomposite)"
 Window="Cửa sổ"

plugins/linux-capture/data/locale/zh-TW.ini

@@ -1,7 +1,7 @@
 X11SharedMemoryScreenInput="截取螢幕（XSHM）"
 Screen="螢幕"
 CaptureCursor="捕捉游標"
-AdvancedSettings="進階設定 "
+AdvancedSettings="進階設定"
 XServer="X server"
 XCCapture="截取視窗（Xcomposite）"
 Window="視窗"

plugins/linux-capture/xcomposite-main.cpp

@@ -82,6 +82,7 @@ extern "C" void xcomposite_load(void)
 	sinfo.video_render = xcompcap_video_render;
 	sinfo.get_width = xcompcap_getwidth;
 	sinfo.get_height = xcompcap_getheight;
+	sinfo.icon_type = OBS_ICON_TYPE_WINDOW_CAPTURE,
 
 	obs_register_source(&sinfo);
 }

plugins/linux-capture/xhelpers.c

@@ -104,6 +104,22 @@ bool randr_is_active(xcb_connection_t *xcb)
 	return true;
 }
 
+static bool randr_has_monitors(xcb_connection_t *xcb)
+{
+	xcb_randr_query_version_cookie_t ver_c;
+	xcb_randr_query_version_reply_t *ver_r;
+
+	ver_c = xcb_randr_query_version(xcb, XCB_RANDR_MAJOR_VERSION,
+					XCB_RANDR_MINOR_VERSION);
+	ver_r = xcb_randr_query_version_reply(xcb, ver_c, 0);
+	if (!ver_r)
+		return 0;
+
+	bool ret = ver_r->major_version > 1 || ver_r->minor_version >= 5;
+	free(ver_r);
+	return ret;
+}
+
 int randr_screen_count(xcb_connection_t *xcb)
 {
 	if (!xcb)
@@ -111,6 +127,19 @@ int randr_screen_count(xcb_connection_t *xcb)
 	xcb_screen_t *screen;
 	screen = xcb_setup_roots_iterator(xcb_get_setup(xcb)).data;
 
+	if (randr_has_monitors(xcb)) {
+		xcb_randr_get_monitors_cookie_t mon_c;
+		xcb_randr_get_monitors_reply_t *mon_r;
+
+		mon_c = xcb_randr_get_monitors(xcb, screen->root, true);
+		mon_r = xcb_randr_get_monitors_reply(xcb, mon_c, 0);
+		if (!mon_r)
+			return 0;
+
+		int count = xcb_randr_get_monitors_monitors_length(mon_r);
+		free(mon_r);
+		return count;
+	}
 	xcb_randr_get_screen_resources_cookie_t res_c;
 	xcb_randr_get_screen_resources_reply_t *res_r;
 
@@ -124,11 +153,58 @@ int randr_screen_count(xcb_connection_t *xcb)
 
 int randr_screen_geo(xcb_connection_t *xcb, int_fast32_t screen,
 		     int_fast32_t *x, int_fast32_t *y, int_fast32_t *w,
-		     int_fast32_t *h, xcb_screen_t **rscreen)
+		     int_fast32_t *h, xcb_screen_t **rscreen, char **name)
 {
 	xcb_screen_t *xscreen;
 	xscreen = xcb_setup_roots_iterator(xcb_get_setup(xcb)).data;
 
+	if (randr_has_monitors(xcb)) {
+		xcb_randr_get_monitors_cookie_t mon_c;
+		xcb_randr_get_monitors_reply_t *mon_r;
+
+		mon_c = xcb_randr_get_monitors(xcb, xscreen->root, true);
+		mon_r = xcb_randr_get_monitors_reply(xcb, mon_c, 0);
+		if (!mon_r)
+			return 0;
+
+		int monitors = xcb_randr_get_monitors_monitors_length(mon_r);
+		if (screen < 0 || screen >= monitors) {
+			free(mon_r);
+			goto fail;
+		}
+
+		xcb_randr_monitor_info_iterator_t mon_i;
+		mon_i = xcb_randr_get_monitors_monitors_iterator(mon_r);
+
+		int s;
+		for (s = 0; s < screen; s++)
+			xcb_randr_monitor_info_next(&mon_i);
+
+		xcb_randr_monitor_info_t *mon = mon_i.data;
+
+		*x = mon->x;
+		*y = mon->y;
+		*w = mon->width;
+		*h = mon->height;
+		if (rscreen)
+			*rscreen = xscreen;
+
+		if (mon->name && name) {
+			xcb_get_atom_name_cookie_t atom_c;
+			xcb_get_atom_name_reply_t *atom_r;
+
+			atom_c = xcb_get_atom_name(xcb, mon->name);
+			atom_r = xcb_get_atom_name_reply(xcb, atom_c, 0);
+			if (atom_r) {
+				*name = strndup(
+					xcb_get_atom_name_name(atom_r),
+					xcb_get_atom_name_name_length(atom_r));
+				free(atom_r);
+			}
+		}
+		free(mon_r);
+		return 0;
+	}
 	xcb_randr_get_screen_resources_cookie_t res_c;
 	xcb_randr_get_screen_resources_reply_t *res_r;
 

plugins/linux-capture/xhelpers.h

@@ -94,7 +94,7 @@ int randr_screen_count(xcb_connection_t *xcb);
  */
 int randr_screen_geo(xcb_connection_t *xcb, int_fast32_t screen,
 		     int_fast32_t *x, int_fast32_t *y, int_fast32_t *w,
-		     int_fast32_t *h, xcb_screen_t **rscreen);
+		     int_fast32_t *h, xcb_screen_t **rscreen, char **name);
 
 /**
  * Get screen geometry for a X11 screen

plugins/linux-capture/xshm-input.c

@@ -104,7 +104,7 @@ static int_fast32_t xshm_update_geometry(struct xshm_data *data)
 	if (data->use_randr) {
 		if (randr_screen_geo(data->xcb, data->screen_id, &data->x_org,
 				     &data->y_org, &data->width, &data->height,
-				     &data->xcb_screen) < 0) {
+				     &data->xcb_screen, NULL) < 0) {
 			return -1;
 		}
 	} else if (data->use_xinerama) {
@@ -308,21 +308,31 @@ static bool xshm_server_changed(obs_properties_t *props, obs_property_t *p,
 				  : xcb_setup_roots_length(xcb_get_setup(xcb));
 
 	for (int_fast32_t i = 0; i < count; ++i) {
+		char *name;
+		char name_tmp[12];
 		int_fast32_t x, y, w, h;
 		x = y = w = h = 0;
 
+		name = NULL;
 		if (randr)
-			randr_screen_geo(xcb, i, &x, &y, &w, &h, NULL);
+			randr_screen_geo(xcb, i, &x, &y, &w, &h, NULL, &name);
 		else if (xinerama)
 			xinerama_screen_geo(xcb, i, &x, &y, &w, &h);
 		else
 			x11_screen_geo(xcb, i, &w, &h);
 
+		if (name == NULL) {
+			sprintf(name_tmp, "%" PRIuFAST32, i);
+			name = name_tmp;
+		}
+
 		dstr_printf(&screen_info,
-			    "Screen %" PRIuFAST32 " (%" PRIuFAST32
-			    "x%" PRIuFAST32 " @ %" PRIuFAST32 ",%" PRIuFAST32
-			    ")",
-			    i, w, h, x, y);
+			    "Screen %s (%" PRIuFAST32 "x%" PRIuFAST32
+			    " @ %" PRIuFAST32 ",%" PRIuFAST32 ")",
+			    name, w, h, x, y);
+
+		if (name != name_tmp)
+			free(name);
 
 		if (h > 0 && w > 0)
 			obs_property_list_add_int(screens, screen_info.array,
@@ -508,4 +518,5 @@ struct obs_source_info xshm_input = {
 	.video_render = xshm_video_render,
 	.get_width = xshm_getwidth,
 	.get_height = xshm_getheight,
+	.icon_type = OBS_ICON_TYPE_DESKTOP_CAPTURE,
 };