1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
|
Author: Chow Loong Jin <hyperair@ubuntu.com>
Description: Fallback on "x-terminal-emulator" if all other terminal
emulators cannot be found.
---
CodeLite/procutils.cpp | 4 -
LiteEditor/manager.cpp | 4 -
Plugin/consolefinder.cpp | 6 +
Plugin/macros.h | 162 +++++++++++++++++++++++------------------------
4 files changed, 90 insertions(+), 86 deletions(-)
--- codelite.orig/CodeLite/procutils.cpp
+++ codelite/CodeLite/procutils.cpp
@@ -419,7 +419,9 @@ bool ProcUtils::Shell()
//try to locate the default terminal
wxString terminal;
wxString where;
- if (Locate(wxT("gnome-terminal"), where)) {
+ if (Locate(wxT("x-terminal-emulator"), where)) {
+ terminal = where;
+ } else if (Locate(wxT("gnome-terminal"), where)) {
terminal = where;
} else if (Locate(wxT("konsole"), where)) {
terminal = where;
--- codelite.orig/LiteEditor/manager.cpp
+++ codelite/LiteEditor/manager.cpp
@@ -1913,8 +1913,8 @@ void Manager::DbgStart ( long pid )
#if defined(__WXGTK__)
wxString where;
- if ( !ExeLocator::Locate ( wxT ( "xterm" ), where ) ) {
- wxMessageBox ( _ ( "Failed to locate 'xterm' application required by CodeLite, please install it and try again!" ), wxT ( "CodeLite" ), wxOK|wxCENTER|wxICON_WARNING, Frame::Get() );
+ if ( !ExeLocator::Locate ( wxT ( "x-terminal-emulator" ), where ) ) {
+ wxMessageBox ( _ ( "Failed to locate 'x-terminal-emulator' application required by CodeLite, please install it and try again!" ), wxT ( "CodeLite" ), wxOK|wxCENTER|wxICON_WARNING, Frame::Get() );
return;
}
#endif
--- codelite.orig/Plugin/macros.h
+++ codelite/Plugin/macros.h
@@ -22,98 +22,98 @@
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
- #ifndef MACROS_H
-#define MACROS_H
-
+ #ifndef MACROS_H
+#define MACROS_H
+
#include <wx/stdpaths.h>
-//-------------------------------------------------------
-// wxWidgets Connect macros
-//-------------------------------------------------------
-
-#define ConnectChoice(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(fn), NULL, this);
-
-#define ConnectButton(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(fn), NULL, this);
-
-#define ConnectListBoxDClick(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler(fn), NULL, this);
-
-#define ConnectCheckBox(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(fn), NULL, this);
-
-#define ConnectListCtrlItemSelected(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(fn), NULL, this);
-
-#define ConnectListCtrlItemActivated(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(fn), NULL, this);
-
-#define ConnectKeyDown(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_KEY_DOWN, wxKeyEventHandler(fn), NULL, this);
-
-#define ConnectCharEvent(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_CHAR, wxKeyEventHandler(fn), NULL, this);
-
-#define ConnectCmdTextEntered(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(fn), NULL, this);
-
-#define ConnectCmdTextUpdated(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(fn), NULL, this);
-
-#define ConnectCombo(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(fn), NULL, this);
-
-#define ConnectCheckList(ctrl, fn)\
- ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler(fn), NULL, this);
-
-#define TrimString(str){\
- str = str.Trim();\
- str = str.Trim(false);\
- }
-
-#define IsSourceFile(ext)\
- (ext == wxT("cpp") || ext == wxT("cxx") || ext == wxT("c") || ext == wxT("c++") || ext == wxT("cc"))
-
-#define BoolToString(b) b ? wxT("yes") : wxT("no")
-
-//-----------------------------------------------------
-// Constants
-//-----------------------------------------------------
-
-const wxString clCMD_NEW = wxT("<New...>");
-const wxString clCMD_EDIT = wxT("<Edit...>");
-const wxString clCMD_DELETE = wxT("<Delete...>");
-
-// constant message
-const wxString BUILD_START_MSG = wxT("----------Build Started--------\n");
-const wxString BUILD_END_MSG = wxT("----------Build Ended----------\n");
+//-------------------------------------------------------
+// wxWidgets Connect macros
+//-------------------------------------------------------
+
+#define ConnectChoice(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(fn), NULL, this);
+
+#define ConnectButton(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(fn), NULL, this);
+
+#define ConnectListBoxDClick(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler(fn), NULL, this);
+
+#define ConnectCheckBox(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(fn), NULL, this);
+
+#define ConnectListCtrlItemSelected(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(fn), NULL, this);
+
+#define ConnectListCtrlItemActivated(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(fn), NULL, this);
+
+#define ConnectKeyDown(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_KEY_DOWN, wxKeyEventHandler(fn), NULL, this);
+
+#define ConnectCharEvent(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_CHAR, wxKeyEventHandler(fn), NULL, this);
+
+#define ConnectCmdTextEntered(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(fn), NULL, this);
+
+#define ConnectCmdTextUpdated(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(fn), NULL, this);
+
+#define ConnectCombo(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(fn), NULL, this);
+
+#define ConnectCheckList(ctrl, fn)\
+ ctrl->Connect(ctrl->GetId(), wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler(fn), NULL, this);
+
+#define TrimString(str){\
+ str = str.Trim();\
+ str = str.Trim(false);\
+ }
+
+#define IsSourceFile(ext)\
+ (ext == wxT("cpp") || ext == wxT("cxx") || ext == wxT("c") || ext == wxT("c++") || ext == wxT("cc"))
+
+#define BoolToString(b) b ? wxT("yes") : wxT("no")
+
+//-----------------------------------------------------
+// Constants
+//-----------------------------------------------------
+
+const wxString clCMD_NEW = wxT("<New...>");
+const wxString clCMD_EDIT = wxT("<Edit...>");
+const wxString clCMD_DELETE = wxT("<Delete...>");
+
+// constant message
+const wxString BUILD_START_MSG = wxT("----------Build Started--------\n");
+const wxString BUILD_END_MSG = wxT("----------Build Ended----------\n");
const wxString BUILD_PROJECT_PREFIX = wxT("----------Building project:[ ");
const wxString CLEAN_PROJECT_PREFIX = wxT("----------Cleaning project:[ ");
-const wxString SEARCH_IN_WORKSPACE = wxT("Entire Workspace");
+const wxString SEARCH_IN_WORKSPACE = wxT("Entire Workspace");
const wxString SEARCH_IN_PROJECT = wxT("Active Project");
-const wxString SEARCH_IN_CURR_FILE_PROJECT = wxT("Current File's Project");
+const wxString SEARCH_IN_CURR_FILE_PROJECT = wxT("Current File's Project");
const wxString SEARCH_IN_CURRENT_FILE = wxT("Current File");
// terminal macro
#ifdef __WXGTK__
-#define TERMINAL_CMD wxString::Format(wxT("%s/codelite_xterm '$(TITLE)' '$(CMD)'"), wxFileName(wxStandardPaths::Get().GetExecutablePath()).GetPath().c_str())
+#define TERMINAL_CMD wxString::Format(wxT("%s/codelite_xterm '$(TITLE)' '$(CMD)'"), wxStandardPaths::Get().GetPluginsDir().c_str())
#elif defined(__WXMAC__)
#define TERMINAL_CMD wxString::Format(wxT("%s/OpenTerm '$(CMD)'"), wxStandardPaths::Get().GetDataDir().c_str())
#else
const wxString TERMINAL_CMD = wxT("");
#endif
-
-#ifdef __WXMSW__
-#define PATH_SEP wxT("\\")
-#else
-#define PATH_SEP wxT("/")
-#endif
-
-#define viewAsMenuItemID 23500
-#define viewAsMenuItemMaxID 23500+100
-
-#define viewAsSubMenuID 23499
-#define RecentFilesSubMenuID 23600
-#define RecentWorkspaceSubMenuID 23650
-#endif // MACROS_H
+#ifdef __WXMSW__
+#define PATH_SEP wxT("\\")
+#else
+#define PATH_SEP wxT("/")
+#endif
+
+#define viewAsMenuItemID 23500
+#define viewAsMenuItemMaxID 23500+100
+
+#define viewAsSubMenuID 23499
+#define RecentFilesSubMenuID 23600
+#define RecentWorkspaceSubMenuID 23650
+
+#endif // MACROS_H
--- codelite.orig/Plugin/consolefinder.cpp
+++ codelite/Plugin/consolefinder.cpp
@@ -153,7 +153,9 @@ wxString ConsoleFinder::GetConsoleName()
//try to locate the default terminal
wxString terminal;
wxString where;
- if (ExeLocator::Locate(wxT("gnome-terminal"), where)) {
+ if (ExeLocator::Locate(wxT("x-terminal-emulator"), where)) {
+ terminal = wxT("x-terminal-emulator -e ");
+ }else if (ExeLocator::Locate(wxT("gnome-terminal"), where)) {
terminal = wxT("gnome-terminal -e ");
} else if (ExeLocator::Locate(wxT("konsole"), where)) {
terminal = wxT("konsole");
@@ -162,7 +164,7 @@ wxString ConsoleFinder::GetConsoleName()
}
if (cmd.IsEmpty()) {
- cmd = wxT("xterm -e ");
+ cmd = wxT("x-terminal-emulator -e ");
}
cmd = terminal;
|
