emacs: src/w32term.c comparison

comparison src/w32term.c @ 90428:a8190f7e546e

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 285-296) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: admin/FOR-RELEASE: Update refcard section. * gnus--rel--5.10 (patch 102-104) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

author	Miles Bader <miles@gnu.org>
date	Wed, 07 Jun 2006 18:05:10 +0000
parents	2ecafc6d5db7 4a38eb2f741d
children	6194dc57516d

comparison

equal deleted inserted replaced

-:ddb25860d044
+:a8190f7e546e
 DWORD dwWindowsThreadId = 0;
 HANDLE hWindowsThread = NULL;
 DWORD dwMainThreadId = 0;
 HANDLE hMainThread = NULL;
-#ifndef SIF_ALL
-/* These definitions are new with Windows 95. */
-#define SIF_RANGE           0x0001
-#define SIF_PAGE            0x0002
-#define SIF_POS             0x0004
-#define SIF_DISABLENOSCROLL 0x0008
-#define SIF_TRACKPOS        0x0010
-#define SIF_ALL             (SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS)
-typedef struct tagSCROLLINFO
-{
-UINT    cbSize;
-UINT    fMask;
-int     nMin;
-int     nMax;
-UINT    nPage;
-int     nPos;
-int     nTrackPos;
-}   SCROLLINFO, FAR *LPSCROLLINFO;
-typedef SCROLLINFO CONST FAR *LPCSCROLLINFO;
-#endif /* SIF_ALL */
-/* Dynamic linking to new proportional scroll bar functions. */
-int (PASCAL *pfnSetScrollInfo) (HWND hwnd, int fnBar, LPSCROLLINFO lpsi, BOOL fRedraw);
-BOOL (PASCAL *pfnGetScrollInfo) (HWND hwnd, int fnBar, LPSCROLLINFO lpsi);
 int vertical_scroll_bar_min_handle;
 int vertical_scroll_bar_top_border;
 int vertical_scroll_bar_bottom_border;
 if (s->hl == DRAW_CURSOR
 && !x_stretch_cursor_p)
 {
 /* If `x-stretch-block-cursor' is nil, don't draw a block cursor
 	 as wide as the stretch glyph.  */
-int width = min (FRAME_COLUMN_WIDTH (s->f), s->background_width);
+int width, background_width = s->background_width;
+int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA);
+if (x < left_x)
+	{
+	  background_width -= left_x - x;
+	  x = left_x;
+	}
+width = min (FRAME_COLUMN_WIDTH (s->f), background_width);
 /* Draw cursor.  */
-x_draw_glyph_string_bg_rect (s, s->x, s->y, width, s->height);
+x_draw_glyph_string_bg_rect (s, x, s->y, width, s->height);
 /* Clear rest using the GC of the original non-cursor face.  */
-if (width < s->background_width)
+if (width < background_width)
 	{
 	  XGCValues *gc = s->face->gc;
-	  int x = s->x + width, y = s->y;
+	  int y = s->y;
-	  int w = s->background_width - width, h = s->height;
+	  int w = background_width - width, h = s->height;
 	  RECT r;
 HDC hdc = s->hdc;
+	  x += width;
 	  if (s->row->mouse_face_p
 	      && cursor_in_mouse_face_p (s->w))
 	    {
 	      x_set_mouse_face_gc (s);
 	      gc = s->gc;
 w32_fill_area (s->f, s->hdc, gc->background, x, y, w, h);
 }
 }
 }
 else if (!s->background_filled_p)
-x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width,
+{
-				 s->height);
+int background_width = s->background_width;
+int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA);
+if (x < left_x)
+	{
+	  background_width -= left_x - x;
+	  x = left_x;
+	}
+if (background_width > 0)
+	x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height);
+}
 s->background_filled_p = 1;
 }
 {
 Window w = SCROLL_BAR_W32_WINDOW (bar);
 double range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height));
 int sb_page, sb_pos;
 BOOL draggingp = !NILP (bar->dragging) ? TRUE : FALSE;
+SCROLLINFO si;
 if (whole)
 {
 /* Position scroll bar at rock bottom if the bottom of the
 buffer is visible. This avoids shinking the thumb away
 sb_pos = 0;
 }
 BLOCK_INPUT;
-if (pfnSetScrollInfo)
+si.cbSize = sizeof (si);
-{
+/* Only update page size if currently dragging, to reduce
-SCROLLINFO si;
+flicker effects.  */
+if (draggingp)
-si.cbSize = sizeof (si);
+si.fMask = SIF_PAGE;
-/* Only update page size if currently dragging, to reduce
-flicker effects.  */
-if (draggingp)
-si.fMask = SIF_PAGE;
-else
-si.fMask = SIF_PAGE | SIF_POS;
-si.nPage = sb_page;
-si.nPos = sb_pos;
-pfnSetScrollInfo (w, SB_CTL, &si, !draggingp);
-}
 else
-SetScrollPos (w, SB_CTL, sb_pos, !draggingp);
+si.fMask = SIF_PAGE | SIF_POS;
+si.nPage = sb_page;
+si.nPos = sb_pos;
+SetScrollInfo (w, SB_CTL, &si, !draggingp);
 UNBLOCK_INPUT;
 }
 struct window *w;
 int top, left, width, height;
 {
 struct frame *f = XFRAME (WINDOW_FRAME (w));
 HWND hwnd;
+SCROLLINFO si;
 struct scroll_bar *bar
 = XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil));
 BLOCK_INPUT;
 /* Requires geometry to be set before call to create the real window */
 hwnd = my_create_scrollbar (f, bar);
-if (pfnSetScrollInfo)
+si.cbSize = sizeof (si);
-{
+si.fMask = SIF_ALL;
-SCROLLINFO si;
+si.nMin = 0;
+si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height)
-si.cbSize = sizeof (si);
++ VERTICAL_SCROLL_BAR_MIN_HANDLE;
-si.fMask = SIF_ALL;
+si.nPage = si.nMax;
-si.nMin = 0;
+si.nPos = 0;
-si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height)
-	+ VERTICAL_SCROLL_BAR_MIN_HANDLE;
+SetScrollInfo (hwnd, SB_CTL, &si, FALSE);
-si.nPage = si.nMax;
-si.nPos = 0;
-pfnSetScrollInfo (hwnd, SB_CTL, &si, FALSE);
-}
-else
-{
-SetScrollRange (hwnd, SB_CTL, 0,
-VERTICAL_SCROLL_BAR_TOP_RANGE (f, height), FALSE);
-SetScrollPos (hwnd, SB_CTL, 0, FALSE);
-}
 SET_SCROLL_BAR_W32_WINDOW (bar, hwnd);
 /* Add bar to its frame's list of scroll bars.  */
 bar->next = FRAME_SCROLL_BARS (f);
 InvalidateRect (hwnd, NULL, FALSE);
 }
 else
 {
 HDC hdc;
+	  SCROLLINFO si;
 BLOCK_INPUT;
 	  if (width && height)
 	    {
 	      hdc = get_frame_dc (f);
 	      /* Since Windows scroll bars are smaller than the space reserved
 area of the parent window now exposed will be refreshed.  */
 my_show_window (f, hwnd, SW_HIDE);
 MoveWindow (hwnd, sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
 		      top, sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
 		      max (height, 1), TRUE);
-if (pfnSetScrollInfo)
-{
+	  si.cbSize = sizeof (si);
-SCROLLINFO si;
+	  si.fMask = SIF_RANGE;
+	  si.nMin = 0;
-si.cbSize = sizeof (si);
+	  si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height)
-si.fMask = SIF_RANGE;
+	    + VERTICAL_SCROLL_BAR_MIN_HANDLE;
-si.nMin = 0;
-si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height)
+	  SetScrollInfo (hwnd, SB_CTL, &si, FALSE);
-+ VERTICAL_SCROLL_BAR_MIN_HANDLE;
-pfnSetScrollInfo (hwnd, SB_CTL, &si, FALSE);
-}
-else
-SetScrollRange (hwnd, SB_CTL, 0,
-VERTICAL_SCROLL_BAR_TOP_RANGE (f, height), FALSE);
 my_show_window (f, hwnd, SW_NORMAL);
 /* InvalidateRect (w, NULL, FALSE);  */
 /* Remember new settings.  */
 XSETINT (bar->left, sb_left);
 {
 int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height));
 int y;
 int dragging = !NILP (bar->dragging);
+SCROLLINFO si;
-if (pfnGetScrollInfo)
-{
+si.cbSize = sizeof (si);
-	SCROLLINFO si;
+si.fMask = SIF_POS;
-	si.cbSize = sizeof (si);
+GetScrollInfo ((HWND) msg->msg.lParam, SB_CTL, &si);
-	si.fMask = SIF_POS;
+y = si.nPos;
-	pfnGetScrollInfo ((HWND) msg->msg.lParam, SB_CTL, &si);
-	y = si.nPos;
-}
-else
-y = GetScrollPos ((HWND) msg->msg.lParam, SB_CTL);
 bar->dragging = Qnil;
 last_mouse_scroll_bar_pos = msg->msg.wParam;
 y = HIWORD (msg->msg.wParam);
 	bar->dragging = Qt;
 	emacs_event->part = scroll_bar_handle;
 	/* "Silently" update current position.  */
-	if (pfnSetScrollInfo)
+	{
-	  {
+	  SCROLLINFO si;
-	    SCROLLINFO si;
+	  si.cbSize = sizeof (si);
-	    si.cbSize = sizeof (si);
+	  si.fMask = SIF_POS;
-	    si.fMask = SIF_POS;
+	  si.nPos = y;
-	    si.nPos = y;
+	  /* Remember apparent position (we actually lag behind the real
-	    /* Remember apparent position (we actually lag behind the real
+	     position, so don't set that directly.  */
-	       position, so don't set that directly.  */
+	  last_scroll_bar_drag_pos = y;
-	    last_scroll_bar_drag_pos = y;
+	  SetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, FALSE);
-	    pfnSetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, FALSE);
+	}
-	  }
-	else
-	  SetScrollPos (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, y, FALSE);
 	break;
 case SB_ENDSCROLL:
 	/* If this is the end of a drag sequence, then reset the scroll
 	   handle size to normal and do a final redraw.  Otherwise do
 	   nothing.  */
 	if (dragging)
 	  {
-	    if (pfnSetScrollInfo)
+	    SCROLLINFO si;
-	      {
+	    int start = XINT (bar->start);
-		SCROLLINFO si;
+	    int end = XINT (bar->end);
-		int start = XINT (bar->start);
-		int end = XINT (bar->end);
+	    si.cbSize = sizeof (si);
+	    si.fMask = SIF_PAGE | SIF_POS;
-		si.cbSize = sizeof (si);
+	    si.nPage = end - start + VERTICAL_SCROLL_BAR_MIN_HANDLE;
-		si.fMask = SIF_PAGE | SIF_POS;
+	    si.nPos = last_scroll_bar_drag_pos;
-si.nPage = end - start + VERTICAL_SCROLL_BAR_MIN_HANDLE;
+	    SetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, TRUE);
-		si.nPos = last_scroll_bar_drag_pos;
-		pfnSetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, TRUE);
-	      }
-	    else
-	      SetScrollPos (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, y, TRUE);
 	  }
 	/* fall through */
 default:
 	emacs_event->kind = NO_EVENT;
 	return FALSE;
 struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar);
 Window w = SCROLL_BAR_W32_WINDOW (bar);
 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
 int pos;
 int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height));
+SCROLLINFO si;
 BLOCK_INPUT;
 *fp = f;
 *bar_window = bar->window;
-if (pfnGetScrollInfo)
+si.cbSize = sizeof (si);
-{
+si.fMask = SIF_POS | SIF_PAGE | SIF_RANGE;
-SCROLLINFO si;
+GetScrollInfo (w, SB_CTL, &si);
-si.cbSize = sizeof (si);
+pos = si.nPos;
-si.fMask = SIF_POS | SIF_PAGE | SIF_RANGE;
+top_range = si.nMax - si.nPage + 1;
-pfnGetScrollInfo (w, SB_CTL, &si);
-pos = si.nPos;
-top_range = si.nMax - si.nPage + 1;
-}
-else
-pos = GetScrollPos (w, SB_CTL);
 switch (LOWORD (last_mouse_scroll_bar_pos))
 {
 case SB_THUMBPOSITION:
 case SB_THUMBTRACK:
 struct glyph_row *row;
 {
 struct frame *f = XFRAME (WINDOW_FRAME (w));
 HDC hdc;
 RECT rect;
-int h;
+int left, top, h;
 struct glyph *cursor_glyph;
 HBRUSH hb = CreateSolidBrush (f->output_data.w32->cursor_pixel);
 /* Get the glyph the cursor is on.  If we can't tell because
 the current matrix is invalid or such, give up.  */
 cursor_glyph = get_phys_cursor_glyph (w);
 if (cursor_glyph == NULL)
 return;
 /* Compute frame-relative coordinates for phys cursor.  */
-rect.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
+get_phys_cursor_geometry (w, row, cursor_glyph, &left, &top, &h);
-rect.top = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
+rect.left = left;
+rect.top = top;
 rect.bottom = rect.top + h;
 rect.right = rect.left + w->phys_cursor_width;
 hdc = get_frame_dc (f);
 /* Set clipping, draw the rectangle, and reset clipping again.  */

Mercurial > emacs

comparison src/w32term.c @ 90428:a8190f7e546e