summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
Diffstat (limited to 'xorg')
-rw-r--r--xorg/X11R7.6/rdp/rdpComposite.c12
-rw-r--r--xorg/X11R7.6/rdp/rdpdraw.c4
-rw-r--r--xorg/X11R7.6/rdp/rdpglyph.c4
-rw-r--r--xorg/X11R7.6/rdp/rdpinput.c20
-rw-r--r--xorg/X11R7.6/rdp/rdpkeyboardbase.c6
-rw-r--r--xorg/X11R7.6/rdp/rdpkeyboardevdev.c4
-rw-r--r--xorg/X11R7.6/rdp/rdpmain.c4
-rw-r--r--xorg/X11R7.6/rdp/rdpmisc.c4
-rw-r--r--xorg/X11R7.6/rdp/rdpup.c2
-rw-r--r--xorg/tests/xdemo/bmp_parser.c2
10 files changed, 31 insertions, 31 deletions
diff --git a/xorg/X11R7.6/rdp/rdpComposite.c b/xorg/X11R7.6/rdp/rdpComposite.c
index f763783e..9376a533 100644
--- a/xorg/X11R7.6/rdp/rdpComposite.c
+++ b/xorg/X11R7.6/rdp/rdpComposite.c
@@ -224,7 +224,7 @@ print_format(PictFormatShort format)
/******************************************************************************/
static int
-compsoite_print(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
+composite_print(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst,
INT16 yDst, CARD16 width, CARD16 height)
{
@@ -233,7 +233,7 @@ compsoite_print(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
rdpPixmapRec* pSrcPriv;
rdpPixmapRec* pDstPriv;
- LLOGLN(0, ("compsoite_print: op %d xSrc %d ySrc %d xDst %d yDst %d "
+ LLOGLN(0, ("composite_print: op %d xSrc %d ySrc %d xDst %d yDst %d "
"width %d height %d",
op, xSrc, ySrc, xDst, yDst, width, height));
@@ -493,7 +493,7 @@ check_drawables(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
{
LLOGLN(10, ("check_drawables: can not remote [%s]", g_com_fail_strings[fail_reason]));
#if 0
- compsoite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
+ composite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
xDst, yDst, width, height);
#endif
}
@@ -501,7 +501,7 @@ check_drawables(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
{
LLOGLN(10, ("check_drawables: can remote [%s]", g_com_fail_strings[fail_reason]));
#if 0
- compsoite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
+ composite_print(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
xDst, yDst, width, height);
#endif
}
@@ -707,7 +707,7 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
{
if (pMask != 0)
{
- /* TODO: here we can try to send it as a gylph */
+ /* TODO: here we can try to send it as a glyph */
}
}
}
@@ -745,7 +745,7 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
post_process = 1;
if (g_do_dirty_os)
{
- LLOGLN(10, ("rdpComposite: gettig dirty"));
+ LLOGLN(10, ("rdpComposite: getting dirty"));
pDstPriv->is_dirty = 1;
dirty_type = g_doing_font ? RDI_IMGLL : RDI_IMGLY;
pDirtyPriv = pDstPriv;
diff --git a/xorg/X11R7.6/rdp/rdpdraw.c b/xorg/X11R7.6/rdp/rdpdraw.c
index d61375ae..51fe5c61 100644
--- a/xorg/X11R7.6/rdp/rdpdraw.c
+++ b/xorg/X11R7.6/rdp/rdpdraw.c
@@ -608,7 +608,7 @@ dump_draw_list(rdpPixmapRec* priv)
/******************************************************************************/
/* returns boolean */
static int
-region_interect_at_all(RegionPtr reg_small, RegionPtr reg_big)
+region_intersect_at_all(RegionPtr reg_small, RegionPtr reg_big)
{
int rv;
RegionRec reg;
@@ -719,7 +719,7 @@ draw_item_pack(PixmapPtr pix, rdpPixmapRec *priv)
{
if ((di->type == RDI_TEXT) && (di_prev->type == RDI_IMGLY))
{
- if (region_interect_at_all(di->reg, di_prev->reg))
+ if (region_intersect_at_all(di->reg, di_prev->reg))
{
di_prev->type = RDI_IMGLL;
}
diff --git a/xorg/X11R7.6/rdp/rdpglyph.c b/xorg/X11R7.6/rdp/rdpglyph.c
index cb895ae5..f0dda8d4 100644
--- a/xorg/X11R7.6/rdp/rdpglyph.c
+++ b/xorg/X11R7.6/rdp/rdpglyph.c
@@ -503,7 +503,7 @@ rdp_text_chars_to_data(struct rdp_text* rtext)
PictFormatPtr format;
} GlyphListRec, *GlyphListPtr;
*/
-/* see ghyphstr.h but the follow is not in there
+/* see glyphstr.h but the following is not in there
typedef struct _XGlyphInfo {
unsigned short width;
unsigned short height;
@@ -557,7 +557,7 @@ rdpGlyphu(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
post_process = 1;
if (g_do_dirty_os)
{
- LLOGLN(10, ("rdpGlyphu: gettig dirty"));
+ LLOGLN(10, ("rdpGlyphu: getting dirty"));
pDstPriv->is_dirty = 1;
dirty_type = RDI_IMGLL;
pDirtyPriv = pDstPriv;
diff --git a/xorg/X11R7.6/rdp/rdpinput.c b/xorg/X11R7.6/rdp/rdpinput.c
index 4801b79c..f221ae34 100644
--- a/xorg/X11R7.6/rdp/rdpinput.c
+++ b/xorg/X11R7.6/rdp/rdpinput.c
@@ -26,7 +26,7 @@ keyboard and mouse stuff
flags right so control down is used to determine between pause and
num lock */
/* this should be fixed in rdesktop */
-/* g_pause_spe flag for specal control sent by ms client before scan code
+/* g_pause_spe flag for special control sent by ms client before scan code
69 is sent to tell that its pause, not num lock. both pause and num
lock use scan code 69 */
@@ -68,7 +68,7 @@ static OsTimerPtr g_kbtimer = 0;
static OsTimerPtr g_timer = 0;
static int g_x = 0;
static int g_y = 0;
-static int g_timer_schedualed = 0;
+static int g_timer_scheduled = 0;
static int g_delay_motion = 1; /* turn on or off */
static int g_use_evdev = 0;
@@ -238,7 +238,7 @@ rdpChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
0x0000042C Azeri Latin
0x0000042F FYRO Macedonian
0x00000437 Georgian
-0x00000438 Faeroese
+0x00000438 Faroese
0x00000439 Devanagari - INSCRIPT
0x0000043A Maltese 47-key
0x0000043B Norwegian with Sami
@@ -859,7 +859,7 @@ static CARD32
rdpDeferredInputCallback(OsTimerPtr timer, CARD32 now, pointer arg)
{
LLOGLN(10, ("rdpDeferredInputCallback:"));
- g_timer_schedualed = 0;
+ g_timer_scheduled = 0;
if ((g_old_x != g_x) || (g_old_y != g_y))
{
rdpEnqueueMotion(g_x, g_y);
@@ -884,13 +884,13 @@ PtrAddEvent(int buttonMask, int x, int y)
return;
}
send_now = (buttonMask ^ g_old_button_mask) || (g_delay_motion == 0);
- LLOGLN(10, ("PtrAddEvent: send_now %d g_timer_schedualed %d",
- send_now, g_timer_schedualed));
+ LLOGLN(10, ("PtrAddEvent: send_now %d g_timer_scheduled %d",
+ send_now, g_timer_scheduled));
if (send_now)
{
- if (g_timer_schedualed)
+ if (g_timer_scheduled)
{
- g_timer_schedualed = 0;
+ g_timer_scheduled = 0;
TimerCancel(g_timer);
}
if ((g_old_x != x) || (g_old_y != y))
@@ -923,9 +923,9 @@ PtrAddEvent(int buttonMask, int x, int y)
{
g_x = x;
g_y = y;
- if (!g_timer_schedualed)
+ if (!g_timer_scheduled)
{
- g_timer_schedualed = 1;
+ g_timer_scheduled = 1;
g_timer = TimerSet(g_timer, 0, 60, rdpDeferredInputCallback, 0);
}
}
diff --git a/xorg/X11R7.6/rdp/rdpkeyboardbase.c b/xorg/X11R7.6/rdp/rdpkeyboardbase.c
index 1c62541d..c35a0392 100644
--- a/xorg/X11R7.6/rdp/rdpkeyboardbase.c
+++ b/xorg/X11R7.6/rdp/rdpkeyboardbase.c
@@ -56,7 +56,7 @@ extern int g_tab_down; /* in rdpmain.c */
#define XSCAN_KP_3 89
#define XSCAN_KP_0 90
#define XSCAN_KP_Decimal 91
-/* "/ ?" on br keybaord */
+/* "/ ?" on br keyboard */
#define XSCAN_97 97 /* ------------------------------? */
#define XSCAN_Enter 108 /* 104 */ /* on keypad */
#define XSCAN_Control_R 109 /* 105 */
@@ -81,7 +81,7 @@ extern int g_tab_down; /* in rdpmain.c */
#define XSCAN_Menu 117 /* 135 */
#define XSCAN_LMeta 156
#define XSCAN_RMeta 156
-#define XSCAN_211 211 /* "/ ?" on br keybaord, "\ _" on jp keyboard */
+#define XSCAN_211 211 /* "/ ?" on br keyboard, "\ _" on jp keyboard */
/******************************************************************************/
void
@@ -279,7 +279,7 @@ KbdAddEvent_base(int down, int param1, int param2, int param3, int param4)
break;
case RDPSCAN_115:
- rdpEnqueueKey(type, XSCAN_211); /* "/ ?" on br keybaord, "\ _" on jp keyboard */
+ rdpEnqueueKey(type, XSCAN_211); /* "/ ?" on br keyboard, "\ _" on jp keyboard */
break;
case RDPSCAN_126:
diff --git a/xorg/X11R7.6/rdp/rdpkeyboardevdev.c b/xorg/X11R7.6/rdp/rdpkeyboardevdev.c
index 770a102f..0c560c83 100644
--- a/xorg/X11R7.6/rdp/rdpkeyboardevdev.c
+++ b/xorg/X11R7.6/rdp/rdpkeyboardevdev.c
@@ -56,7 +56,7 @@ extern int g_tab_down; /* in rdpmain.c */
#define XSCAN_KP_3 89
#define XSCAN_KP_0 90
#define XSCAN_KP_Decimal 91
-/* "/ ?" on br keybaord */
+/* "/ ?" on br keyboard */
#define XSCAN_97 97
#define XSCAN_Enter 104 /* on keypad */
#define XSCAN_Control_R 105
@@ -278,7 +278,7 @@ KbdAddEvent_evdev(int down, int param1, int param2, int param3, int param4)
break;
case RDPSCAN_115:
- rdpEnqueueKey(type, XSCAN_97); /* "/ ?" on br keybaord */
+ rdpEnqueueKey(type, XSCAN_97); /* "/ ?" on br keyboard */
break;
case RDPSCAN_126:
diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c
index f173de57..95de7be0 100644
--- a/xorg/X11R7.6/rdp/rdpmain.c
+++ b/xorg/X11R7.6/rdp/rdpmain.c
@@ -414,7 +414,7 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
g_rdpScreen.CloseScreen = pScreen->CloseScreen;
/* GC procedures */
g_rdpScreen.CreateGC = pScreen->CreateGC;
- /* Pixmap procudures */
+ /* Pixmap procedures */
g_rdpScreen.CreatePixmap = pScreen->CreatePixmap;
g_rdpScreen.DestroyPixmap = pScreen->DestroyPixmap;
@@ -654,7 +654,7 @@ void
OsVendorInit(void)
{
#if XRDP_DISABLE_LINUX_ABSTRACT
- /* turn off the Linux abstract unix doamin sockets TRANS_ABSTRACT */
+ /* turn off the Linux abstract unix domain sockets TRANS_ABSTRACT */
/* TRANS_NOLISTEN = 1 << 3 */
_XSERVTransSocketLocalFuncs.flags = 0;
#endif
diff --git a/xorg/X11R7.6/rdp/rdpmisc.c b/xorg/X11R7.6/rdp/rdpmisc.c
index 1d57d1fa..f8316ff8 100644
--- a/xorg/X11R7.6/rdp/rdpmisc.c
+++ b/xorg/X11R7.6/rdp/rdpmisc.c
@@ -254,7 +254,7 @@ g_malloc(int size, int zero)
//#ifdef _XSERVER64
#if 1
- /* I thought xalloc whould work here but I guess not, why, todo */
+ /* I thought xalloc would work here but I guess not, why, todo */
rv = (char *)malloc(size);
#else
rv = (char *)Xalloc(size);
@@ -279,7 +279,7 @@ g_free(void *ptr)
{
//#ifdef _XSERVER64
#if 1
- /* I thought xfree whould work here but I guess not, why, todo */
+ /* I thought xfree would work here but I guess not, why, todo */
free(ptr);
#else
Xfree(ptr);
diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c
index 230c1538..0532d063 100644
--- a/xorg/X11R7.6/rdp/rdpup.c
+++ b/xorg/X11R7.6/rdp/rdpup.c
@@ -2122,7 +2122,7 @@ rdpup_send_area(struct image_data *id, int x, int y, int w, int h)
safety = 0;
while (RegionContainsRect(g_shm_reg, &box))
{
- /* instread of rdpup_end_update, call rdpup_send_pending */
+ /* instead of rdpup_end_update, call rdpup_send_pending */
rdpup_send_pending();
rdpup_begin_update();
safety++;
diff --git a/xorg/tests/xdemo/bmp_parser.c b/xorg/tests/xdemo/bmp_parser.c
index 66c050d8..60d86864 100644
--- a/xorg/tests/xdemo/bmp_parser.c
+++ b/xorg/tests/xdemo/bmp_parser.c
@@ -70,7 +70,7 @@ int parse_bmp(char *filename, struct pic_info *pic_info)
if ((fd = open(filename, O_RDONLY)) < 0)
{
- printf("error opeing %s\n", filename);
+ printf("error opening %s\n", filename);
return -1;
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-10 01:17:15 +0000