Attachment #560 for bug #869

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 869
Collapse All | Expand All

Lines 273-278 Link Here

(-)tdebase/twin/useractions.cpp (+2 lines)
273	cutWalkThroughDesktopListReverse = keys->shortcut("Walk Through Desktop List (Reverse)");	273	cutWalkThroughDesktopListReverse = keys->shortcut("Walk Through Desktop List (Reverse)");
274	cutWalkThroughWindows = keys->shortcut("Walk Through Windows");	274	cutWalkThroughWindows = keys->shortcut("Walk Through Windows");
275	cutWalkThroughWindowsReverse = keys->shortcut("Walk Through Windows (Reverse)");	275	cutWalkThroughWindowsReverse = keys->shortcut("Walk Through Windows (Reverse)");
		276	cutWalkThroughApps = keys->shortcut("Walk Through Windows of Same Application");
		277	cutWalkThroughAppsReverse = keys->shortcut("Walk Through Windows of Same Application (Reverse)");
276		278
277	keys->updateConnections();	279	keys->updateConnections();
278	disable_shortcuts_keys->updateConnections();	280	disable_shortcuts_keys->updateConnections();

Lines 339-344 Link Here

(-)tdebase/twin/workspace.h (+4 lines)
339		339
340	void slotWalkThroughDesktops();	340	void slotWalkThroughDesktops();
341	void slotWalkBackThroughDesktops();	341	void slotWalkBackThroughDesktops();
		342	void slotWalkThroughApps();
		343	void slotWalkBackThroughApps();
		344
342	void slotWalkThroughDesktopList();	345	void slotWalkThroughDesktopList();
343	void slotWalkBackThroughDesktopList();	346	void slotWalkBackThroughDesktopList();
344	void slotWalkThroughWindows();	347	void slotWalkThroughWindows();
Lines 559-564 Link Here
559	KShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse;	562	KShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse;
560	KShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse;	563	KShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse;
561	KShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse;	564	KShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse;
		565	KShortcut cutWalkThroughApps, cutWalkThroughAppsReverse;
562	bool mouse_emulation;	566	bool mouse_emulation;
563	unsigned int mouse_emulation_state;	567	unsigned int mouse_emulation_state;
564	WId mouse_emulation_window;	568	WId mouse_emulation_window;




    setLineWidth(2);
    setMargin(2);

    appsOnly = false;
    showMiniIcon = false;

    no_tasks = i18n("*** No Windows ***");

    m = mode;
    }


/*!
  Create list of clients on specified desktop, starting with client c
*/
void TabBox::createClientList(ClientList &list, int desktop /*-1 = all*/, Client *c, bool chain)
    {
    ClientList::size_type idx = 0;
    TQString startclass = NULL;
    list.clear();

    Client* start = c;

    if( start != NULL ) 
        startclass = start->resourceClass();

    if ( chain )
        c = workspace()->nextFocusChainClient(c);
    else

                // nothing
                }
            }
        if(appsOnly && (!TQString::compare( startclass, c->resourceClass()) == 0))
            {
            add = NULL;
            }

        if( options->separateScreenFocus && options->xineramaEnabled )
            {

    XEvent otherEvent;
    while (XCheckTypedEvent (qt_xdisplay(), EnterNotify, &otherEvent ) )
        ;
    appsOnly = FALSE;
    }



        }
    else
        {
        if ( areModKeysDepressed( cutWalkThroughWindows  ) )
            {
            if ( startKDEWalkThroughWindows() )
                KDEWalkThroughWindows( true );

        }
    }

void Workspace::slotWalkThroughApps() {
  kdDebug(0) << "slot walk" << endl;
  tab_box->appsOnly = TRUE;
  slotWalkThroughWindows();
}

void Workspace::slotWalkBackThroughApps() {
    tab_box->appsOnly = TRUE;  
    slotWalkBackThroughWindows();
}
void Workspace::slotWalkThroughDesktops()
    {
    if ( root != qt_xrootwin() )

    {
    bool forward = false;
    bool backward = false;
    bool forwardapps = false;
    bool backwardapps = false;

    if (tab_grab)
        {
        forward = cutWalkThroughWindows.contains( keyX );
        backward = cutWalkThroughWindowsReverse.contains( keyX );

        forwardapps = cutWalkThroughApps.contains( keyX );      
        backwardapps = cutWalkThroughAppsReverse.contains( keyX );

        if ( (forward || backward) && (!tab_box->appsOnly) )
            {
            kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal()
                << " or " << cutWalkThroughWindowsReverse.keyCodeQt() << endl;
             KDEWalkThroughWindows( forward );
            }
        
       if ( (forwardapps || backwardapps) && (tab_box->appsOnly) )
            {
            kdDebug(125) << "== " << cutWalkThroughApps.toStringInternal()
                << " or " << cutWalkThroughAppsReverse.toStringInternal() << endl;
            KDEWalkThroughWindows( forwardapps );
            }
       }
    
    else if (control_grab)
        {
        forward = cutWalkThroughDesktops.contains( keyX ) ||

Lines 35-40 Link Here

(-)tdebase/twin/tabbox.h (+1 lines)
35	Client* currentClient();	35	Client* currentClient();
36	void setCurrentClient( Client* c );	36	void setCurrentClient( Client* c );
37	int currentDesktop();	37	int currentDesktop();
		38	bool appsOnly;
38		39
39	// DesktopMode and WindowsMode are based on the order in which the desktop	40	// DesktopMode and WindowsMode are based on the order in which the desktop
40	// or window were viewed.	41	// or window were viewed.

Lines 20-25 Link Here

(-)tdebase/twin/twinbindings.cpp (+2 lines)
20	keys->insert( "Group:Navigation", i18n("Navigation") );	20	keys->insert( "Group:Navigation", i18n("Navigation") );
21	DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() );	21	DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() );
22	DEF( I18N_NOOP("Walk Through Windows (Reverse)"), ALT+SHIFT+Qt::Key_Tab, ALT+SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() );	22	DEF( I18N_NOOP("Walk Through Windows (Reverse)"), ALT+SHIFT+Qt::Key_Tab, ALT+SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() );
		23	DEF( I18N_NOOP("Walk Through Windows of Same Application"), ALT+Qt::Key_QuoteLeft, ALT+Qt::Key_QuoteLeft, slotWalkThroughApps() );
		24	DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"), ALT+Qt::Key_AsciiTilde, ALT+Qt::Key_AsciiTilde, slotWalkBackThroughApps() );
23	DEF( I18N_NOOP("Walk Through Desktops"), 0, WIN+Qt::Key_Tab, slotWalkThroughDesktops() );	25	DEF( I18N_NOOP("Walk Through Desktops"), 0, WIN+Qt::Key_Tab, slotWalkThroughDesktops() );
24	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), 0, WIN+SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() );	26	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), 0, WIN+SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() );
25	DEF( I18N_NOOP("Walk Through Desktop List"), 0, 0, slotWalkThroughDesktopList() );	27	DEF( I18N_NOOP("Walk Through Desktop List"), 0, 0, slotWalkThroughDesktopList() );

Return to bug 869

Lines 47-52 Link Here

(-)tdebase/twin/tabbox.cpp (-7 / +39 lines)
47	setLineWidth(2);	47	setLineWidth(2);
48	setMargin(2);	48	setMargin(2);
49		49
		50	appsOnly = false;
50	showMiniIcon = false;	51	showMiniIcon = false;
51		52
52	no_tasks = i18n("* No Windows *");	53	no_tasks = i18n("* No Windows *");
Lines 86-103 Link Here
86	m = mode;	87	m = mode;
87	}	88	}
88		89
89
90	/*!	90	/*!
91	Create list of clients on specified desktop, starting with client c	91	Create list of clients on specified desktop, starting with client c
92	*/	92	*/
93	void TabBox::createClientList(ClientList &list, int desktop /-1 = all/, Client *c, bool chain)	93	void TabBox::createClientList(ClientList &list, int desktop /-1 = all/, Client *c, bool chain)
94	{	94	{
95	ClientList::size_type idx = 0;	95	ClientList::size_type idx = 0;
96		96	TQString startclass = NULL;
97	list.clear();	97	list.clear();
98		98
99	Client* start = c;	99	Client* start = c;
100		100
		101	if( start != NULL )
		102	startclass = start->resourceClass();
		103
101	if ( chain )	104	if ( chain )
102	c = workspace()->nextFocusChainClient(c);	105	c = workspace()->nextFocusChainClient(c);
103	else	106	else
Lines 121-126 Link Here
121	// nothing	124	// nothing
122	}	125	}
123	}	126	}
		127	if(appsOnly && (!TQString::compare( startclass, c->resourceClass()) == 0))
		128	{
		129	add = NULL;
		130	}
124		131
125	if( options->separateScreenFocus && options->xineramaEnabled )	132	if( options->separateScreenFocus && options->xineramaEnabled )
126	{	133	{
Lines 645-650 Link Here
645	XEvent otherEvent;	652	XEvent otherEvent;
646	while (XCheckTypedEvent (qt_xdisplay(), EnterNotify, &otherEvent ) )	653	while (XCheckTypedEvent (qt_xdisplay(), EnterNotify, &otherEvent ) )
647	;	654	;
		655	appsOnly = FALSE;
648	}	656	}
649		657
650		658
Lines 856-862 Link Here
856	}	864	}
857	else	865	else
858	{	866	{
859	if ( areModKeysDepressed( cutWalkThroughWindows ) )	867	if ( areModKeysDepressed( cutWalkThroughWindows ) )
860	{	868	{
861	if ( startKDEWalkThroughWindows() )	869	if ( startKDEWalkThroughWindows() )
862	KDEWalkThroughWindows( true );	870	KDEWalkThroughWindows( true );
Lines 893-898 Link Here
893	}	901	}
894	}	902	}
895		903
		904	void Workspace::slotWalkThroughApps() {
		905	kdDebug(0) << "slot walk" << endl;
		906	tab_box->appsOnly = TRUE;
		907	slotWalkThroughWindows();
		908	}
		909
		910	void Workspace::slotWalkBackThroughApps() {
		911	tab_box->appsOnly = TRUE;
		912	slotWalkBackThroughWindows();
		913	}
896	void Workspace::slotWalkThroughDesktops()	914	void Workspace::slotWalkThroughDesktops()
897	{	915	{
898	if ( root != qt_xrootwin() )	916	if ( root != qt_xrootwin() )
Lines 1112-1129 Link Here
1112	{	1130	{
1113	bool forward = false;	1131	bool forward = false;
1114	bool backward = false;	1132	bool backward = false;
		1133	bool forwardapps = false;
		1134	bool backwardapps = false;
1115		1135
1116	if (tab_grab)	1136	if (tab_grab)
1117	{	1137	{
1118	forward = cutWalkThroughWindows.contains( keyX );	1138	forward = cutWalkThroughWindows.contains( keyX );
1119	backward = cutWalkThroughWindowsReverse.contains( keyX );	1139	backward = cutWalkThroughWindowsReverse.contains( keyX );
1120	if (forward \|\| backward)	1140
		1141	forwardapps = cutWalkThroughApps.contains( keyX );
		1142	backwardapps = cutWalkThroughAppsReverse.contains( keyX );
		1143
		1144	if ( (forward \|\| backward) && (!tab_box->appsOnly) )
1121	{	1145	{
1122	kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal()	1146	kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal()
1123	<< " or " << cutWalkThroughWindowsReverse.toStringInternal() << endl;	1147	<< " or " << cutWalkThroughWindowsReverse.keyCodeQt() << endl;
1124	KDEWalkThroughWindows( forward );	1148	KDEWalkThroughWindows( forward );
1125	}	1149	}
1126	}	1150
		1151	if ( (forwardapps \|\| backwardapps) && (tab_box->appsOnly) )
		1152	{
		1153	kdDebug(125) << "== " << cutWalkThroughApps.toStringInternal()
		1154	<< " or " << cutWalkThroughAppsReverse.toStringInternal() << endl;
		1155	KDEWalkThroughWindows( forwardapps );
		1156	}
		1157	}
		1158
1127	else if (control_grab)	1159	else if (control_grab)
1128	{	1160	{
1129	forward = cutWalkThroughDesktops.contains( keyX ) \|\|	1161	forward = cutWalkThroughDesktops.contains( keyX ) \|\|