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

some EMX fixes, thanks dave_yeo at paralynx

Browse source
This commit is contained in:
fluxgen 2004-07-19 13:53:46 +00:00
parent 66feb6dd89
commit 44f7069e1c
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/FbCommands.cc
View file

@ -19,7 +19,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: FbCommands.cc,v 1.24 2004/04/22 21:12:32 fluxgen Exp $ // $Id: FbCommands.cc,v 1.25 2004/07/19 13:52:15 fluxgen Exp $
#include "FbCommands.hh" #include "FbCommands.hh"
#include "fluxbox.hh" #include "fluxbox.hh"
@ -37,6 +37,15 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif // HAVE_CONFIG_H
#if defined(__EMX__) && defined(HAVE_PROCESS_H)
#include <process.h> // for P_NOWAIT
#endif // __EMX__
using namespace std; using namespace std;
namespace FbCommands { namespace FbCommands {
@ -46,7 +55,7 @@ ExecuteCmd::ExecuteCmd(const std::string &cmd, int screen_num):m_cmd(cmd), m_scr
} }
void ExecuteCmd::execute() { void ExecuteCmd::execute() {
#ifndef __EMX__ #ifndef __EMX__
if (! fork()) { if (! fork()) {
std::string displaystring("DISPLAY="); std::string displaystring("DISPLAY=");
displaystring += DisplayString(FbTk::App::instance()->display()); displaystring += DisplayString(FbTk::App::instance()->display());
@ -70,7 +79,7 @@ void ExecuteCmd::execute() {
exit(0); exit(0);
} }
#else // __EMX__ #else // __EMX__
spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", item->exec().c_str(), 0); spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_cmd.c_str(), 0);
#endif // !__EMX__ #endif // !__EMX__
} }
@ -125,9 +134,9 @@ void ShowRootMenuCmd::execute() {
int wx, wy; int wx, wy;
unsigned int mask; unsigned int mask;
if ( XQueryPointer(FbTk::App::instance()->display(), if (XQueryPointer(FbTk::App::instance()->display(),
screen->rootWindow().window(), &root_ret, &window_ret, screen->rootWindow().window(), &root_ret, &window_ret,
&rx, &ry, &wx, &wy, &mask) ) { &rx, &ry, &wx, &wy, &mask) ) {
if ( rx - (screen->getRootmenu().width()/2) > 0 ) if ( rx - (screen->getRootmenu().width()/2) > 0 )
rx-= screen->getRootmenu().width()/2; rx-= screen->getRootmenu().width()/2;

6
src/FbTk/I18n.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: I18n.hh,v 1.1 2004/06/07 11:46:05 rathnor Exp $ // $Id: I18n.hh,v 1.2 2004/07/19 13:53:46 fluxgen Exp $
#ifndef I18N_HH #ifndef I18N_HH
#define I18N_HH #define I18N_HH
@ -44,7 +44,7 @@
extern "C" { extern "C" {
#include <nl_types.h> #include <nl_types.h>
} }
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__) || defined(__EMX__)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif // __cplusplus #endif // __cplusplus
@ -68,7 +68,7 @@ void catclose(nl_catd cat);
// ignore the description, it's for helping translators // ignore the description, it's for helping translators
#define _FBTEXT(msgset, msgid, default_text, description) \ #define _FBTEXT(msgset, msgid, default_text, description) \
i18n.getMessage(FBNLS::msgset ## Set, FBNLS::msgset ## msgid, default_text) i18n.getMessage(FBNLS::msgset ## Set, FBNLS::msgset ## msgid, default_text)
// This ensure that FbTk nls stuff is in a kind of namespace of its own // This ensure that FbTk nls stuff is in a kind of namespace of its own
#define _FBTKTEXT( msgset, msgid, default_text, description) \ #define _FBTKTEXT( msgset, msgid, default_text, description) \
i18n.getMessage(FBNLS::FbTk ## msgset ## Set, FBNLS::FbTk ## msgset ## msgid, default_text) i18n.getMessage(FBNLS::FbTk ## msgset ## Set, FBNLS::FbTk ## msgset ## msgid, default_text)