nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added showMenu function

Browse source
This commit is contained in:
fluxgen 2002-08-12 03:28:17 +00:00
parent a691d915f8
commit 88bb66a1ee
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.66 2002/08/11 22:44:29 fluxgen Exp $ // $Id: Window.cc,v 1.67 2002/08/12 03:28:17 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -321,9 +321,9 @@ tab(0)
setFocusFlag(false); setFocusFlag(false);
#ifdef GNOME #ifdef GNOME
updateGnomeAtoms(); updateGnomeAtoms();
#endif #endif // GNOME
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "%s(%d): FluxboxWindow(this=%p)\n", __FILE__, __LINE__, this); fprintf(stderr, "%s(%d): FluxboxWindow(this=%p)\n", __FILE__, __LINE__, this);
@ -333,7 +333,7 @@ tab(0)
FluxboxWindow::~FluxboxWindow() { FluxboxWindow::~FluxboxWindow() {
if (screen==0) //the window wasn't created if (screen == 0) //the window wasn't created
return; return;
Fluxbox *fluxbox = Fluxbox::instance(); Fluxbox *fluxbox = Fluxbox::instance();
@ -360,12 +360,12 @@ FluxboxWindow::~FluxboxWindow() {
tab = 0; tab = 0;
} }
if (client.mwm_hint!=0) { if (client.mwm_hint != 0) {
XFree(client.mwm_hint); XFree(client.mwm_hint);
client.mwm_hint = 0; client.mwm_hint = 0;
} }
if (client.blackbox_hint!=0) { if (client.blackbox_hint != 0) {
XFree(client.blackbox_hint); XFree(client.blackbox_hint);
client.blackbox_hint = 0; client.blackbox_hint = 0;
} }
@ -374,9 +374,9 @@ FluxboxWindow::~FluxboxWindow() {
if (isTransient()) { if (isTransient()) {
//guard from having transient_for = this //guard from having transient_for = this
if (client.transient_for == this) { if (client.transient_for == this) {
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): WARNING! client.transient_for == this WARNING!"<<endl; cerr<<__FILE__<<"("<<__LINE__<<"): WARNING! client.transient_for == this WARNING!"<<endl;
#endif //DEBUG #endif //DEBUG
client.transient_for = 0; client.transient_for = 0;
} }
@ -1954,6 +1954,10 @@ void FluxboxWindow::withdraw() {
void FluxboxWindow::maximize(unsigned int button) { void FluxboxWindow::maximize(unsigned int button) {
// deiconify if we're iconic
if (isIconic())
deiconify();
if (! maximized) { if (! maximized) {
int dx, dy; int dx, dy;
unsigned int dw, dh, slitModL = 0, slitModR = 0, slitModT = 0, slitModB = 0; unsigned int dw, dh, slitModL = 0, slitModR = 0, slitModT = 0, slitModB = 0;
@ -2619,6 +2623,13 @@ void FluxboxWindow::restoreAttributes() {
setState(current_state); setState(current_state);
} }
void FluxboxWindow::showMenu(int mx, int my) {
windowmenu->move(mx, my);
windowmenu->show();
XRaiseWindow(display, windowmenu->windowID());
XRaiseWindow(display, windowmenu->getSendToMenu()->windowID());
XRaiseWindow(display, windowmenu->getSendGroupToMenu()->windowID());
}
void FluxboxWindow::restoreGravity() { void FluxboxWindow::restoreGravity() {
// restore x coordinate // restore x coordinate
@ -3173,11 +3184,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent *be) {
if (windowmenu) { if (windowmenu) {
if (! windowmenu->isVisible()) { // if not window menu is visible then show it if (! windowmenu->isVisible()) { // if not window menu is visible then show it
windowmenu->move(mx, my); showMenu(mx, my);
windowmenu->show();
XRaiseWindow(display, windowmenu->windowID());
XRaiseWindow(display, windowmenu->getSendToMenu()->windowID());
XRaiseWindow(display, windowmenu->getSendGroupToMenu()->windowID());
} else //else hide menu } else //else hide menu
windowmenu->hide(); windowmenu->hide();
} }

4
src/Window.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.hh,v 1.26 2002/08/11 22:33:41 fluxgen Exp $ // $Id: Window.hh,v 1.27 2002/08/12 03:28:17 fluxgen Exp $
#ifndef WINDOW_HH #ifndef WINDOW_HH
#define WINDOW_HH #define WINDOW_HH
@ -201,7 +201,7 @@ public:
void setWorkspace(int n); void setWorkspace(int n);
void changeBlackboxHints(BaseDisplay::BlackboxHints *bh); void changeBlackboxHints(BaseDisplay::BlackboxHints *bh);
void restoreAttributes(); void restoreAttributes();
void showMenu(int mx, int my);
void buttonPressEvent(XButtonEvent *be); void buttonPressEvent(XButtonEvent *be);
void buttonReleaseEvent(XButtonEvent *be); void buttonReleaseEvent(XButtonEvent *be);