Changeset 3890f30a863e18a1a8ca7114c2285ddcdf0349f9

Timestamp:

18/11/07 21:47:58 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1195418878 +0000

git-parent:

[a89d3bb46ca0b352eba3790ca2a856802722be9b]

git-author:

Rafaël Carré <funman@videolan.org> 1195418878 +0000

Message:

ncurses: various bugfixes

• Workaround KEY_END not working with $TERM=xterm on FreeBSD
  
• Don't abort when printing strings with unprintable characters ( for example when the user presses ctrl+something in FIND or OPEN boxes )
  
• Show a '*' in front of the current node
  
• Add files in the correct node
  

This is how nodes do work in ncurses: When you select an item with 'Enter',

• if it's a leaf, then start playing it, and set the current node to the toplevel parent of that leaf (example: local playlist, or media library)
  
• if it's an empty node, then stop the playlist, and set the current node to be that one, so you can add items to it
  
• if it's a node with children, set the current node to that one, and start playing the next children of that one
  

The "current node" means that the playlist will never reach items which aren't direct or indirect children of that node, and so it will stop after the last one has been reached

Files:

• modules/gui/ncurses.c (modified) (9 diffs)

modules/gui/ncurses.c

@@ -541 +541 @@
-                p_sys->i_box_plidx = 0;
-                break;
+#ifdef __FreeBSD__
+/* workaround for FreeBSD + xterm:
+ * see http://www.nabble.com/curses-vs.-xterm-key-mismatch-t3574377.html */
+            case KEY_SELECT:
+#endif
-            case KEY_END:
-                p_sys->i_box_plidx = p_sys->p_playlist->items.i_size - 1;
@@ -601 +606 @@
-                                      VLC_TRUE, p_parent, p_item );
-                }
+                else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
+                        == 0 )
+                {   /* We only want to set the current node */
+                    vlc_object_lock( p_sys->p_playlist );
+
+                    p_sys->p_playlist->request.p_node = 
+                        p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
+                    p_sys->p_playlist->request.i_skip = 0;
+                    p_sys->p_playlist->request.p_item =
+                        p_sys->p_playlist->status.p_item;
+                    p_sys->p_playlist->request.b_request = VLC_TRUE;
+                    p_sys->p_playlist->request.i_status = PLAYLIST_STOPPED;
+
+                    vlc_object_unlock( p_sys->p_playlist );
+                }
-                else
-   /* FIXME doesn't work if the node is empty */
+
-                    playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
-                        VLC_TRUE,
@@ -636 +656 @@
-                p_sys->i_box_bidx = 0;
-                break;
+#ifdef __FreeBSD__
+            case KEY_SELECT:
+#endif
-            case KEY_END:
-                p_sys->i_box_bidx = p_sys->i_dir_entries - 1;
@@ -670 +693 @@
-                    playlist_item_t *p_parent = p_sys->p_playlist->status.p_node;
-                    if( !p_parent )
-root
-
-
+local
+
+&& p_parent->p_parent->p_parent 
-                        p_parent = p_parent->p_parent;
-
-                    playlist_Add( p_sys->p_playlist, psz_uri, NULL,
-                                  PLAYLIST_APPEND, PLAYLIST_END,
-
+
+
-                                  , VLC_FALSE );
-                    p_sys->i_box_type = BOX_PLAYLIST;
@@ -714 +738 @@
-                p_sys->i_box_start = 0;
-                return 1;
+#ifdef __FreeBSD__
+            case KEY_SELECT:
+#endif
-            case KEY_END:
-                p_sys->i_box_start = p_sys->i_box_lines_total - 1;
@@ -749 +776 @@
-                ManageSlider( p_intf );
-                return 1;
+#ifdef __FreeBSD__
+            case KEY_SELECT:
+#endif
-            case KEY_END:
-                p_sys->f_slider = 99.9;
@@ -835 +865 @@
-                {
-                    playlist_item_t *p_parent = p_sys->p_playlist->status.p_node;
+
-                    if( !p_parent )
-root
-
-
+local
+
+&& p_parent->p_parent->p_parent 
-                        p_parent = p_parent->p_parent;
-
-                    playlist_Add( p_playlist, p_sys->psz_open_chain, NULL,
-                                  PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END,
-
+
+
-                                  , VLC_FALSE );
-                    p_sys->b_box_plidx_follow = VLC_TRUE;
@@ -1193 +1225 @@
-        i_width = wcswidth( psz_wide, i_char_len );
-        if( i_width == (size_t)-1 )
+        {
-            /* a non printable character was encountered */
-
+
+
+
+
+
+
+
+
+
+
-    }
-    if( i_width > (size_t)w )
@@ -1791 +1833 @@
-        {
-            vlc_bool_t b_selected = ( p_sys->i_box_plidx == i_item );
-
-
+
+
+
+
+
+
+
-
-            if( y >= y_end ) break;