[xine-cvs] CVS: xine-ui/src/xitk panel.c,1.130,1.131 stream_infos.c,1.11,1.12

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory usw-pr-cvs1:/tmp/cvs-serv4507

Modified Files:
	panel.c stream_infos.c 
Log Message:
Make Mike happy: set focus to vo window on panel dismiss. Rename wrong 'Sizes' to 'Resolution' in stream info window.

Index: panel.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/panel.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- panel.c	15 Nov 2002 21:10:18 -0000	1.130
+++ panel.c	15 Nov 2002 21:19:26 -0000	1.131
@@ -411,6 +411,8 @@
     if(gGui->cursor_grabbed)
        XGrabPointer(gGui->display, gGui->video_window, 1, None, GrabModeAsync, GrabModeAsync, gGui->video_window, None, CurrentTime);
     
+    /* Give focus to video output window */
+    XSetInputFocus(gGui->display, gGui->video_window, RevertToParent, CurrentTime);
     XUnlockDisplay(gGui->display);
      
   } 

Index: stream_infos.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/stream_infos.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stream_infos.c	13 Nov 2002 23:33:45 -0000	1.11
+++ stream_infos.c	15 Nov 2002 21:19:27 -0000	1.12
@@ -66,7 +66,7 @@
   struct {
     xitk_widget_t      *bitrate;
     xitk_widget_t      *seekable;
-    xitk_widget_t      *video_sizes;
+    xitk_widget_t      *video_resolution;
     xitk_widget_t      *video_ratio;
     xitk_widget_t      *video_channels;
     xitk_widget_t      *video_streams;
@@ -299,7 +299,7 @@
   /* */
   xitk_label_change_label(sinfos->widget_list, sinfos->infos.bitrate, "---");
   xitk_label_change_label(sinfos->widget_list, sinfos->infos.seekable, "---");
-  xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_sizes, "--- X ---");
+  xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_resolution, "--- X ---");
   xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_ratio, "---");
   xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_channels, "---");
   xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_streams, "---");
@@ -370,7 +370,7 @@
       iinfo2 = xine_get_stream_info(gGui->stream, XINE_STREAM_INFO_VIDEO_HEIGHT);
       memset(&buffer, 0, sizeof(buffer));
       sprintf(buffer, "%d X %d", iinfo, iinfo2);
-      xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_sizes, buffer);
+      xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_resolution, buffer);
 
       iinfo = xine_get_stream_info(gGui->stream, XINE_STREAM_INFO_VIDEO_RATIO);
       xitk_label_change_label(sinfos->widget_list, sinfos->infos.video_ratio, (get_num_string(iinfo)));
@@ -785,7 +785,7 @@
 
   x += w + 15;
   w += 4;
-  draw_inner_frame(gGui->imlib_data, bg, _("Sizes: "), lfontname, 
+  draw_inner_frame(gGui->imlib_data, bg, _("Resolution: "), lfontname, 
 		    x - 5, y - 2, w + 10, 20 + 15);
   lbl.window            = xitk_window_get_window(sinfos->xwin);
   lbl.gc                = sinfos->widget_list->gc;
@@ -793,7 +793,7 @@
   lbl.label             = "";
   lbl.callback          = NULL;
   xitk_list_append_content(sinfos->widget_list->l, 
-			   (sinfos->infos.video_sizes = 
+			   (sinfos->infos.video_resolution = 
 			    xitk_noskin_label_create(sinfos->widget_list, &lbl,
 						     x, y, w, 20, sinfosfontname)));
   x += w + 15;