From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stas Sergeev <stssppnn@yahoo.com>
Subject: Re: mouse grabbing gotcha (was: dosemu 1.1.3.9 user report)
Date: Tue, 17 Dec 2002 05:25:54 +0300
Sender: linux-msdos-owner@vger.kernel.org
Message-ID: <3DFE8B32.60706@yahoo.com>
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------030600020709060405010200"
Return-path: <linux-msdos-owner@vger.kernel.org>
List-Id: <linux-msdos.vger.kernel.org>
To: linux-msdos@vger.kernel.org

This is a multi-part message in MIME format.
--------------030600020709060405010200
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hello.

Bart Oldeman wrote:
>> default "Home" should be changed.
>  Pause is already taken as being a force pause (freeze).
But it doesn't actually work, it
just lock up dosemu in a non-TSC
mode unless the attached patch is
applied.

> One problem is that you can define just about any keycombo in some of
> these window managers, so there is nothing that works everywhere;
Well, there are either the combos
that are always reserved by some
WMs, and those can and should be
avoided.

> however some combinations are used more often than others.
User-defined combos is not something
we have to care about, that was not
what I mean.

> ctrl+alt+scroll_lock might be something that makes sense though, since
> you're locking the mouse.
The only disadvantage of it is that
it switches a scroll-lock led:)

> For KDE I have ctrl+alt+esc (kill), ctrl+alt+del (logout).
And you'll probably never know what
other combos it already reserved
without you even asking it about:)
I think dosemu can avoid using those.

--------------030600020709060405010200
Content-Type: text/plain;
 name="cputime.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cputime.diff"

--- src/emu-i386/cputime.c	Mon Dec 16 00:45:12 2002
+++ src/emu-i386/cputime.c	Tue Dec 17 04:54:30 2002
@@ -181,7 +181,6 @@
      * but only flags processing (& other features) */
     RAWcpuTIME = rawP5time;		/* in usecs */
     GETcpuTIME = getP5time;		/* in usecs */
-    ZeroTimeBase.td = GETTSC();		/* in CPU cycles */
     g_printf("TIMER: using pentium timing\n");
   }
   else {
@@ -189,7 +188,6 @@
      * 'rdtsc off' into config file */
     RAWcpuTIME = rawC4time;		/* in usecs */
     GETcpuTIME = getC4time;		/* in usecs */
-    ZeroTimeBase.td = rawC4time();	/* in usecs */
     if (config.realcpu) {
       if (kernel_version_code < 0x2017e)
         g_printf("TIMER: using gettimeofday\n");
@@ -197,6 +195,7 @@
         g_printf("TIMER: using new gettimeofday with microsecond resolution\n");
     }
   }
+  ZeroTimeBase.td = RAWcpuTIME();
 }
 
 
@@ -208,7 +207,7 @@
   if (cpu_time_stop) return 1;
   if (!quiet) dbug_printf("STOP TIME\n");
   StopTimeBase = RAWcpuTIME();
-  LastTimeRead = StopTimeBase - TSCtoUS(ZeroTimeBase.td);
+  LastTimeRead = StopTimeBase - ZeroTimeBase.td;
   cpu_time_stop = 1;
   return 0;
 }
@@ -218,7 +217,7 @@
 {
   if (!cpu_time_stop) return 1;
   if (!quiet) dbug_printf("RESTART TIME\n");
-  ZeroTimeBase.td += ((RAWcpuTIME() - StopTimeBase) * config.CPUSpeedInMhz);
+  ZeroTimeBase.td += RAWcpuTIME() - StopTimeBase;
   cpu_time_stop = 0;
   return 0;
 }

--------------030600020709060405010200--