rewrite hint positioning to respect multimonitor boundaries

Author: dk

Prima/Classes.pm

@@ -2370,8 +2370,8 @@ sub profile_default
 sub max_extents
 {
 	shift;
-	my @pos = @_ || $::application-> pointerPos;
-	my @sz = $::application->size;
+	my @pos = @_ ? @_ : $::application-> pointerPos;
+	my @sz  = $::application->size;
 	for my $r ( @{$::application->get_monitor_rects} ) {
 		next unless
 			$r->[0] <= $pos[0] && $r->[2] > $pos[0] &&
@@ -2407,6 +2407,60 @@ sub on_change
 	$self-> size(@sz);
 }
 
+sub on_hint
+{
+	my ( $self, $widget, @around) = @_;
+
+	my (@pos, @size);
+	if ( 4 == (grep { $_ == -1 } @around)) {
+		@size = $widget->size;
+		@pos  = $widget->client_to_screen(0,0);
+	} else {
+		@pos = @around[0,1];
+		$size[0] = $around[2] - $pos[0];
+		$size[1] = $around[3] - $pos[1];
+	}
+
+	$self->set(
+		text      => $widget->hint,
+		color     => $widget->hintColor,
+		backColor => $widget->hintBackColor,
+	);
+
+	my @psize   = map { $::application->get_system_value($_) } (
+		sv::XPointer, sv::YPointer
+	);
+	my @mouse   = $::application->pointerPos;
+	my @monitor = $::application->point_to_monitor(@mouse);
+	my @hsize   = $self->size;
+	my @fin     = ($mouse[0] - $psize[0]/2, $pos[1] - $hsize[1] - 1);
+	$fin[1] = $mouse[1] - $hsize[1] - $psize[1]
+		if $fin[1] > $mouse[1] - $hsize[1] - $psize[1];
+	$fin[0] = $pos[0] - $hsize[0]
+		if $fin[0] + $hsize[0] > $monitor[2];
+	$fin[0] = $monitor[0]
+		if $fin[0] < $monitor[0];
+	$fin[1] = $pos[1] - $hsize[1]
+		if $fin[1] + $hsize[1] >= $monitor[3];
+	$fin[1] = $pos[1] + $size[1] + $psize[1]/2
+		if $fin[1] < $monitor[1];
+	$fin[1] = $monitor[2] - $hsize[1]
+		if $fin[1] + $hsize[1] >= $monitor[3];
+	$fin[1] = $monitor[1]
+		if $fin[1] < $monitor[1];
+	if (
+		$fin[0] <= $mouse[0] && $fin[0] + $hsize[0] >= $mouse[0] + $psize[0] &&
+		$fin[1] <= $mouse[1] && $fin[1] + $hsize[1] >= $mouse[1] + $psize[1]
+	) {
+		$fin[0] = $mouse[0] + $psize[0];
+		$fin[1] = $mouse[1] - $psize[1] - $hsize[1];
+	}
+
+	$self->origin(@fin);
+	$self->show;
+	$self->bring_to_front;
+}
+
 sub on_paint
 {
 	my ($self,$canvas) = @_;
@@ -2646,6 +2700,20 @@ sub open_help
 	return $self-> {HelpClass}-> open($link);
 }
 
+sub point_to_monitor
+{
+	shift;
+	my @pos = @_ ? @_ : $::application-> pointerPos;
+	for my $r ( @{$::application->get_monitor_rects} ) {
+		next unless
+			$r->[0] <= $pos[0] && $r->[2] > $pos[0] &&
+			$r->[1] <= $pos[1] && $r->[3] > $pos[1]
+		;
+		return @$r;
+	}
+	return (0,0,$::application->size);
+}
+
 sub on_die
 {
 	my ($self, $err, $stack) = @_;

class/Application.c

@@ -762,57 +762,11 @@ Application_get_scroll_rate( Handle self)
 static void
 hshow( Handle self)
 {
-	PWidget_vmt hintUnder = CWidget( var->  hintUnder);
-	SV * text = hintUnder-> get_hint( var->  hintUnder);
-	Point size;
-	Point s = my-> get_size( self);
-	Point fin = {0,0};
-	Point pos = fin;
-	Point mouse = my-> get_pointerPos( self);
-	Point hintSize;
-	PWidget_vmt hintWidget = CWidget( var->  hintWidget);
-
-	if (
-		var-> hintAround.left   == -1 &&
-		var-> hintAround.bottom == -1 &&
-		var-> hintAround.right  == -1 &&
-		var-> hintAround.top    == -1
-	) {
-		size = hintUnder-> get_size( var->  hintUnder);
-		apc_widget_map_points( var-> hintUnder, true, 1, &pos);
-	} else {
-		pos.x  = var->hintAround.left;
-		pos.y  = var->hintAround.bottom;
-		size.x = var->hintAround.right - pos.x;
-		size.y = var->hintAround.top   - pos.y;
-	}
-
-	hintWidget-> set_text( var->  hintWidget, text);
-	hintWidget-> set_color( var-> hintWidget, PWidget(var-> hintUnder)-> hintColor);
-	hintWidget-> set_backColor( var-> hintWidget, PWidget(var-> hintUnder)-> hintBackColor);
-	hintSize = hintWidget-> get_size( var->  hintWidget);
-
-	fin. x = mouse. x - 16;
-	fin. y = pos. y - hintSize. y - 1;
-	if ( fin. y > mouse. y - hintSize. y - 32) fin. y = mouse. y - hintSize. y - 32;
-
-	if ( fin. x + hintSize. x >= s. x) fin. x = pos. x - hintSize. x;
-	if ( fin. x < 0) fin. x = 0;
-	if ( fin. y + hintSize. y >= s. y) fin. y = pos. y - hintSize. y;
-	if ( fin. y < 0) fin. y = pos. y + size. y + 16;
-	if ( fin. y + hintSize. y >= s. y) fin. y = s. y - hintSize. y;
-	if ( fin. y < 0) fin. y = 0;
-	if (
-		fin. x <= mouse.x && fin.x + hintSize.x >= mouse.x + 32 &&
-		fin. y <= mouse.y && fin.y + hintSize.y >= mouse.y + 32 
-	) {
-		fin. x = mouse.x + 32;
-		fin. y = mouse.y - 32 - hintSize.y;
-	}
-
-	hintWidget-> set_origin( var->  hintWidget, fin);
-	hintWidget-> show( var->  hintWidget);
-	hintWidget-> bring_to_front( var->  hintWidget);
+	CWidget(var->hintWidget)->notify(
+		var->hintWidget,
+		"sHR", "Hint",
+		var->hintUnder, var->hintAround
+	);
 }
 
 void