diff options
| author | sgilbertson <sgilbertson@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-07 16:49:37 +0000 |
|---|---|---|
| committer | sgilbertson <sgilbertson@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-07 16:49:37 +0000 |
| commit | 2dfcb59597a2fc564033f2c0c988a08e13b16624 (patch) | |
| tree | 441eea7f802c2d97678acc092a8a87d337d789ca /libjava/gnu/gcj/xlib | |
| parent | 00c61749d8c40660ddb439580c05ec5cba8f6a3c (diff) | |
| download | ppe42-gcc-2dfcb59597a2fc564033f2c0c988a08e13b16624.tar.gz ppe42-gcc-2dfcb59597a2fc564033f2c0c988a08e13b16624.zip | |
2005-04-07 Scott Gilbertson <scottg@mantatest.com>
* gnu/gcj/xlib/natXAnyEvent.cc (loadNext): Added timeout.
* gnu/awt/xlib/XCanvasPeer.java (setBackground): Removed
throw UnsupportedOperationException, fixed comments.
(setFont, setForeground): Fixed comments.
* gnu/awt/xlib/XEventLoop.java (postNextEvent): Changed
return type to boolean.
(getNextEvent): Fixed javadocs.
* gnu/awt/xlib/XToolkit.java (interrupted): Removed field.
(nativeQueueEmpty): Removed unused code.
(iterateNativeQueue): Removed outer loop.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96029 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/gcj/xlib')
| -rw-r--r-- | libjava/gnu/gcj/xlib/natXAnyEvent.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/gnu/gcj/xlib/natXAnyEvent.cc b/libjava/gnu/gcj/xlib/natXAnyEvent.cc index 0bef563ed2d..26d3b604b04 100644 --- a/libjava/gnu/gcj/xlib/natXAnyEvent.cc +++ b/libjava/gnu/gcj/xlib/natXAnyEvent.cc @@ -69,11 +69,14 @@ jboolean gnu::gcj::xlib::XAnyEvent::loadNext(jboolean block) int xfd = XConnectionNumber(dpy); int pipefd = pipe[0]; int n = (xfd > pipefd ? xfd : pipefd) + 1; + struct timeval timeout; + timeout.tv_usec = 100000; // 100ms timeout + timeout.tv_sec = 0; fd_set rfds; FD_ZERO(&rfds); FD_SET(xfd, &rfds); FD_SET(pipefd, &rfds); - int sel = _Jv_select (n, &rfds, NULL, NULL, NULL); + int sel = _Jv_select (n, &rfds, NULL, NULL, &timeout); if (sel > 0) { if (FD_ISSET(xfd, &rfds)) |
