fix bug in imageview module

image_view_module/CMakeLists.txt

@@ -29,6 +29,7 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} IMSOURCES)
 find_package(PkgConfig REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(GLUT REQUIRED)
+find_package(X11 REQUIRED)
 
 if(NOT GLUT_FOUND OR NOT OPENGL_FOUND)
 	message("GLUT library not found, image view won't be available")
@@ -143,7 +144,7 @@ else()
 		)
 	endif(NOT DEFINED NOGETTEXT)
 endif(NOT DEFINED STANDALONE)
-target_link_libraries(${IMLIB} ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} -lm -lpthread)
+target_link_libraries(${IMLIB} ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${X11_LIBRARIES} -lm -lpthread)
 include_directories(${${IMLIB}_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
 link_directories(${${IMLIB}_LIBRARY_DIRS})
 endif(NOT GLUT_FOUND OR NOT OPENGL_FOUND)

image_view_module/imageview.c

@@ -91,8 +91,10 @@ void createWindow(windowData *win){
 	win->zoom = 1. / win->Daspect;
 	glEnable(GL_TEXTURE_2D);
 	glBindTexture(GL_TEXTURE_2D, win->Tex);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, win->image->w, win->image->h, 0,
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+			GL_RGB, GL_UNSIGNED_BYTE, win->image->rawdata);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 //    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 //    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
@@ -100,8 +102,6 @@ void createWindow(windowData *win){
 
 	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 	//glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, win->image->w, win->image->h, 0,
-			GL_RGB, GL_UNSIGNED_BYTE, win->image->rawdata);
 	glDisable(GL_TEXTURE_2D);
 	totWindows++;
 	createMenu(win->GL_ID);
@@ -236,10 +236,17 @@ void RedrawWindow(){
 */
 	w /= 2.; h /= 2.;
 	glBegin(GL_QUADS);
-		glTexCoord2f(0.0f, 0.0f); glVertex2f(-w, -h );
+/*
-		glTexCoord2f(1.0f, 0.0f); glVertex2f( w, -h );
+		glTexCoord2f(1.0f, 1.0f); glVertex2f( w,  h ); // top right
-		glTexCoord2f(1.0f, 1.0f); glVertex2f( w,  h );
+		glTexCoord2f(1.0f, 0.0f); glVertex2f( w, -h ); // bottom right
-		glTexCoord2f(0.0f, 1.0f); glVertex2f(-w,  h );
+		glTexCoord2f(0.0f, 0.0f); glVertex2f(-w, -h ); // bottom left
+		glTexCoord2f(0.0f, 1.0f); glVertex2f(-w,  h ); // top left
+		*/
+		glTexCoord2f(1.0f, 1.0f); glVertex2f( -w, -h ); // top right
+		glTexCoord2f(1.0f, 0.0f); glVertex2f( -w, h ); // bottom right
+		glTexCoord2f(0.0f, 0.0f); glVertex2f(w, h ); // bottom left
+		glTexCoord2f(0.0f, 1.0f); glVertex2f(w,  -h ); // top left
+		
 	glEnd();
 	glDisable(GL_TEXTURE_2D);
 	glFinish();

image_view_module/locale/ru/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-02 13:58+0300\n"
+"POT-Creation-Date: 2020-01-23 12:32+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,41 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/eddy/tmp/image_view_module/macros.c:175
+#: /tmp/image_view_module/imageview.c:132
-msgid "No filename given!"
-msgstr ""
-
-#: /home/eddy/tmp/image_view_module/macros.c:177
-#, c-format
-msgid "Can't open %s for reading"
-msgstr ""
-
-#: /home/eddy/tmp/image_view_module/macros.c:179
-#, c-format
-msgid "Can't stat %s"
-msgstr ""
-
-#: /home/eddy/tmp/image_view_module/macros.c:182
-msgid "Mmap error for input"
-msgstr ""
-
-#: /home/eddy/tmp/image_view_module/macros.c:183
-msgid "Can't close mmap'ed file"
-msgstr ""
-
-#: /home/eddy/tmp/image_view_module/macros.c:192
-msgid "Can't munmap"
-msgstr ""
-
-#: /home/eddy/tmp/image_view_module/imageview.c:132
 msgid "Error removing from list"
 msgstr ""
 
-#: /home/eddy/tmp/image_view_module/imageview.c:362
+#: /tmp/image_view_module/imageview.c:369
 msgid "Can't init mutex!"
 msgstr ""
 
 #. "õÖÅ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÏ!"
-#: /home/eddy/tmp/image_view_module/imageview.c:389
+#: /tmp/image_view_module/imageview.c:396
 msgid "Already initialized!"
 msgstr ""
+
+#: /tmp/image_view_module/macros.c:175
+msgid "No filename given!"
+msgstr ""
+
+#: /tmp/image_view_module/macros.c:177
+#, c-format
+msgid "Can't open %s for reading"
+msgstr ""
+
+#: /tmp/image_view_module/macros.c:179
+#, c-format
+msgid "Can't stat %s"
+msgstr ""
+
+#: /tmp/image_view_module/macros.c:182
+msgid "Mmap error for input"
+msgstr ""
+
+#: /tmp/image_view_module/macros.c:183
+msgid "Can't close mmap'ed file"
+msgstr ""
+
+#: /tmp/image_view_module/macros.c:192
+msgid "Can't munmap"
+msgstr ""

image_view_module/locale/ru/ru.po

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2015-03-02 12:05+0300\n"
+        "POT-Creation-Date: 2020-01-23 12:32+0300\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,41 @@ msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Content-Transfer-Encoding: 8bit\n"
 
 #. "õÖÅ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÏ!"
-#: /home/eddy/tmp/image_view_module/imageview.c:389
+#: /tmp/image_view_module/imageview.c:396
 msgid   "Already initialized!"
 msgstr  "õÖÅ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÏ!"
 
-#: /home/eddy/tmp/image_view_module/macros.c:183
+#: /tmp/image_view_module/macros.c:183
 msgid   "Can't close mmap'ed file"
 msgstr  "îÅ ÍÏÇÕ ÚÁËÒÙÔØ mmap'ÎÕÔÙÊ ÆÁÊÌ"
 
-#: /home/eddy/tmp/image_view_module/imageview.c:362
+#: /tmp/image_view_module/imageview.c:369
 msgid   "Can't init mutex!"
 msgstr  "îÅ ÍÏÇÕ ÉÎÉÃÉÉÒÏ×ÁÔØ ×ÚÁÉÍÎÏÅ ÉÓËÌÀÞÅÎÉÅ!"
 
-#: /home/eddy/tmp/image_view_module/macros.c:192
+#: /tmp/image_view_module/macros.c:192
 msgid   "Can't munmap"
 msgstr  "îÅ ÍÏÇÕ ×ÙÚÙ×ÁÔØ munmap"
 
-#: /home/eddy/tmp/image_view_module/macros.c:177
+#: /tmp/image_view_module/macros.c:177
 #, c-format
 msgid   "Can't open %s for reading"
 msgstr  "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
 
-#: /home/eddy/tmp/image_view_module/macros.c:179
+#: /tmp/image_view_module/macros.c:179
 #, c-format
 msgid   "Can't stat %s"
 msgstr  "îÅ ÍÏÇÕ ×ÙÐÏÌÎÉÔØ stat ÄÌÑ %s"
 
-#: /home/eddy/tmp/image_view_module/imageview.c:132
+#: /tmp/image_view_module/imageview.c:132
 msgid   "Error removing from list"
 msgstr  "ïÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÉÚ ÓÐÉÓËÁ"
 
-#: /home/eddy/tmp/image_view_module/macros.c:182
+#: /tmp/image_view_module/macros.c:182
 msgid   "Mmap error for input"
 msgstr  "ïÛÉÂËÁ mmap ÄÌÑ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ"
 
-#: /home/eddy/tmp/image_view_module/macros.c:175
+#: /tmp/image_view_module/macros.c:175
 msgid   "No filename given!"
 msgstr  "îÅ ÕËÁÚÁÎÏ ÉÍÑ ÆÁÊÌÁ!"
 

image_view_module/main.c

@@ -50,11 +50,15 @@ void* change_image(void *data){
 	//	DBG("refresh");
 		GLubyte *raw = win->image->rawdata;
 		for(y = 0; y < h; y++){
+			if(y<5){
+			raw += w*3; continue;
+			}
 			if(y%20 == 19){
 				raw += w*3;
 				continue;
 			}
 			for(x = 0; x < w; x++){
+			if(x==14){raw+=15;x+=4; continue;}
 				if(x%20 != 19){
 					if(i < 80) raw[0]++;
 					else if(i < 170) raw[1]++;