ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
25 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
26 34
27 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
28 36
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 38
31 $TOOLTIP->set_tooltip_from ($widget); 39 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 40 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 41 }
43 42
44 return; 43 return;
45 } 44 }
46 } 45 }
47 } 46 }
48 47
49 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51});
52
53sub get_layout {
54 my $layout;
55
56 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { };
58
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63
64 $win->{show} = $_->{visible} && $_->{is_toplevel};
65 }
66
67 $layout
68}
69
70sub set_layout {
71 my ($layout) = @_;
72
73 $LAYOUT = $layout;
51} 74}
52 75
53# class methods for events 76# class methods for events
54sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 78 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 79 if $FOCUS;
57} 80}
58 81
59sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 83 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 84 if $FOCUS;
85}
86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
62} 98}
63 99
64sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
65 my ($ev) = @_; 101 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
67 103
68 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
69 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
70 108
71 $GRAB = $widget; 109 $GRAB = $widget;
72 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
73 111
74 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
75 } 113 }
76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 114
79 if ($GRAB) { 115 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y); 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
82 } 128 }
83} 129}
84 130
85sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
86 my ($ev) = @_; 132 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y});
88 133
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
90 135
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 137
93 if ($GRAB) { 138 $GRAB->emit (button_up => $ev)
94 ($x, $y) = $GRAB->coord2local ($x, $y); 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 140
98 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 143 $grab->update if $grab;
101 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
102 145
103 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
104 } 148 }
105} 149}
106 150
107sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
108 my ($ev) = @_; 152 my ($ev) = @_;
109 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
110 154
111 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
112 156
113 if ($widget != $HOVER) { 157 check_hover $widget;
114 my $hover = $HOVER; $HOVER = $widget;
115 158
116 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
117 $HOVER->update if $HOVER && $HOVER->{can_hover};
118
119 check_tooltip;
120 }
121
122 if ($HOVER) { 160 if $HOVER;
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
126} 161}
127 162
128# convert position array to integers 163# convert position array to integers
129sub harmonize { 164sub harmonize {
130 my ($vals) = @_; 165 my ($vals) = @_;
… …
144 179
145 $_->update 180 $_->update
146 for @widgets; 181 for @widgets;
147} 182}
148 183
184sub reconfigure_widgets {
185 # make a copy, otherwise C<for> complains about freed values.
186 my @widgets = values %WIDGET;
187
188 $_->reconfigure
189 for @widgets;
190}
191
149# call when resolution changes etc. 192# call when resolution changes etc.
150sub rescale_widgets { 193sub rescale_widgets {
151 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
152 195
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 196 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 197 if ($widget->{is_toplevel}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 207
208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
210
166 } 211 }
167
168 $widget->reconfigure;
169 } 212 }
213
214 reconfigure_widgets;
170} 215}
171 216
172############################################################################# 217#############################################################################
173 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
174package CFClient::UI::Base; 227package CFPlus::UI::Base;
175 228
176use strict; 229use strict;
177 230
178use CFClient::OpenGL; 231use CFPlus::OpenGL;
179 232
180sub new { 233sub new {
181 my $class = shift; 234 my $class = shift;
182 235
183 my $self = bless { 236 my $self = bless {
184 x => 0, 237 x => "center",
185 y => 0, 238 y => "center",
186 z => 0, 239 z => 0,
240 w => undef,
241 h => undef,
187 can_events => 1, 242 can_events => 1,
188 @_ 243 @_
189 }, $class; 244 }, $class;
190 245
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
247
191 for (keys %$self) { 248 for (keys %$self) {
192 if (/^connect_(.*)$/) { 249 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
194 } 251 }
195 } 252 }
196 253
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
259
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262
263 $self->show if $layout->{show};
264 }
198 265
199 $self 266 $self
200} 267}
201 268
202sub destroy { 269sub destroy {
203 my ($self) = @_; 270 my ($self) = @_;
204 271
205 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
206 %$self = (); 274 %$self = ();
207} 275}
208 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
209sub show { 281sub show {
210 my ($self) = @_; 282 my ($self) = @_;
283
211 return if $self->{parent}; 284 return if $self->{parent};
212 285
213 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
214} 287}
215 288
216sub show_centered { 289sub set_visible {
217 my ($self) = @_; 290 my ($self) = @_;
291
218 return if $self->{parent}; 292 return if $self->{visible};
219 293
220 $self->show; 294 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1;
221 296
222 $CFClient::UI::ROOT->on_post_alloc ( 297 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 298
229sub hide { 299 $self->realloc if !exists $self->{req_w};
300
301 $_->set_visible for $self->children;
302}
303
304sub set_invisible {
230 my ($self) = @_; 305 my ($self) = @_;
306
307 return unless $self->{visible};
308
309 $_->set_invisible for $self->children;
310
311 delete $self->{visible};
312 delete $self->{root};
231 313
232 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
234 316
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
318 if $TOOLTIP->{owner} == $self;
319
320 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0);
322}
323
324sub set_visibility {
325 my ($self, $visible) = @_;
326
327 return if $self->{visible} == $visible;
328
329 $visible ? $self->show
330 : $self->hide;
331}
332
333sub toggle_visibility {
334 my ($self) = @_;
335
336 $self->{visible}
337 ? $self->hide
338 : $self->show;
339}
340
341sub hide {
342 my ($self) = @_;
343
344 $self->set_invisible;
345
235 $self->{parent}->remove ($self) 346 $self->{parent}->remove ($self)
236 if $self->{parent}; 347 if $self->{parent};
237} 348}
238 349
239sub move { 350sub move_abs {
240 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
241 352
242 $self->{x} = int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243 $self->{y} = int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
244 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
245 356
246 $self->update; 357 $self->update;
247} 358}
248 359
249sub set_size { 360sub set_size {
250 my ($self, $w, $h) = @_; 361 my ($self, $w, $h) = @_;
251 362
252 $self->{user_w} = $w; 363 $self->{force_w} = $w;
253 $self->{user_h} = $h; 364 $self->{force_h} = $h;
254 365
255 $self->check_size; 366 $self->realloc;
256} 367}
257 368
258sub size_request { 369sub size_request {
259 require Carp; 370 require Carp;
260 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
261} 372}
262 373
374sub baseline_shift {
375 0
376}
377
263sub configure { 378sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
265 380
266 if ($self->{aspect}) { 381 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h);
383
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
269 386
270 # use alignment to adjust x, y 387 # use alignment to adjust x, y
271 388
272 $x += int +($w - $w2) * 0.5; 389 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 390 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 391 }
277 392
278 if ($self->{x} != $x || $self->{y} != $y) { 393 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 394 $self->{x} = $x;
280 $self->{y} = $y; 395 $self->{y} = $y;
281 $self->update; 396 $self->update;
282 } 397 }
283 398
284 if ($self->{w} != $w || $self->{h} != $h) { 399 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 400 return unless $self->{visible};
286 }
287}
288 401
289sub size_allocate { 402 $self->{alloc_w} = $w;
290 # nothing to be done 403 $self->{alloc_h} = $h;
291}
292 404
293sub reconfigure { 405 $self->{root}{size_alloc}{$self+0} = $self;
294 my ($self) = @_; 406 }
295
296 $self->check_size (1);
297 $self->update;
298} 407}
299 408
300sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
301} 415}
302 416
303sub set_max_size { 417sub set_max_size {
304 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
305 419
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
308} 424}
309 425
310sub set_tooltip { 426sub set_tooltip {
311 my ($self, $tooltip) = @_; 427 my ($self, $tooltip) = @_;
312 428
429 $tooltip =~ s/^\s+//;
430 $tooltip =~ s/\s+$//;
431
432 return if $self->{tooltip} eq $tooltip;
433
313 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
314 435
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
318 } 439 }
319} 440}
320 441
321# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
322sub coord2local { 443sub coord2local {
323 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
324 445
446 Carp::confess unless $self->{parent};#d#
447
325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
326} 449}
327 450
328# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
329sub coord2global { 452sub coord2global {
330 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
331 454
455 Carp::confess unless $self->{parent};#d#
456
332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
333} 458}
334 459
335sub focus_in { 460sub invoke_focus_in {
336 my ($self) = @_; 461 my ($self) = @_;
337 462
338 return if $FOCUS == $self; 463 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
340 465
341 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
342 467
343 $self->emit (focus_in => $focus); 468 $self->update;
344 469
345 $focus->update if $focus; 470 0
346 $FOCUS->update;
347} 471}
348 472
349sub focus_out { 473sub invoke_focus_out {
350 my ($self) = @_; 474 my ($self) = @_;
351 475
352 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
353 477
354 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
355 479
356 $self->emit (focus_out => $focus); 480 $self->update;
357 481
358 $focus->update if $focus; #? 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
359} 483 unless $FOCUS;
360 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
361sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
362sub button_up { } 496sub invoke_button_up { 0 }
363sub key_down { } 497sub invoke_key_down { 0 }
364sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
365 500
366sub button_down { 501sub invoke_button_down {
367 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
368 503
369 $self->focus_in; 504 $self->grab_focus;
370}
371 505
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 506 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 507}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
377 508
378sub draw { 509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
379 my ($self) = @_; 521 my ($self, $signal) = @_;
380 522
381 return unless $self->{h} && $self->{w}; 523 delete $self->{signal_cb}{$signal};
382
383 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387
388 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2;
392 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0;
409 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h};
412 glEnd;
413 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 }
416} 524}
417 525
418sub _draw { 526my %has_coords = (
419 my ($self) = @_; 527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
420 532
421 warn "no draw defined for $self\n"; 533sub emit {
422} 534 my ($self, $signal, @args) = @_;
423 535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
424sub find_widget { 556#sub find_widget {
425 my ($self, $x, $y) = @_; 557# in .xs
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435 558
436sub set_parent { 559sub set_parent {
437 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
438 561
439 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
440 563 $self->set_visible if $parent->{visible};
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446} 564}
447 565
448sub check_size { 566sub realloc {
449 my ($self, $forced) = @_; 567 my ($self) = @_;
450 568
451 $self->{force_alloc} = 1 if $forced; 569 if ($self->{visible}) {
452 $CFClient::UI::ROOT->{check_size}{$self} = $self; 570 return if $self->{root}{realloc}{$self+0};
571
572 $self->{root}{realloc}{$self+0} = $self;
573 $self->{root}->update;
574 } else {
575 delete $self->{req_w};
576 delete $self->{req_h};
577 }
453} 578}
454 579
455sub update { 580sub update {
456 my ($self) = @_; 581 my ($self) = @_;
457 582
458 $self->{parent}->update 583 $self->{parent}->update
459 if $self->{parent}; 584 if $self->{parent};
460} 585}
461 586
462sub connect { 587sub reconfigure {
463 my ($self, $signal, $cb) = @_; 588 my ($self) = @_;
464 589
465 push @{ $self->{signal_cb}{$signal} }, $cb; 590 $self->realloc;
591 $self->update;
466} 592}
467 593
468sub emit { 594# using global variables seems a bit hacky, but passing through all drawing
469 my ($self, $signal, @args) = @_; 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
470 597
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 598#sub draw {
599#CFPlus.xs
600
601sub _draw {
602 my ($self) = @_;
603
604 warn "no draw defined for $self\n";
472} 605}
473 606
474sub DESTROY { 607sub DESTROY {
475 my ($self) = @_; 608 my ($self) = @_;
476 609
610 return if CFPlus::in_destruct;
611
612 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
477 delete $WIDGET{$self+0}; 615 delete $WIDGET{$self+0};
478 #$self->deactivate;
479} 616}
480 617
481############################################################################# 618#############################################################################
482 619
483package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
484 621
485our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
486 623
487use strict; 624use strict;
488use CFClient::OpenGL; 625use CFPlus::OpenGL;
489 626
490sub new { 627sub new {
491 my $class = shift; 628 my $class = shift;
492 629
493 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
508 645
509 if ($color && (@$color < 4 || $color->[3])) { 646 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 647 my ($w, $h) = @$self{qw(w h)};
511 648
512 glEnable GL_BLEND; 649 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 651 glColor_premultiply @$color;
515 652
516 glBegin GL_QUADS; 653 glBegin GL_QUADS;
517 glVertex 0 , 0; 654 glVertex 0 , 0;
518 glVertex 0 , $h; 655 glVertex 0 , $h;
519 glVertex $w, $h; 656 glVertex $w, $h;
… …
524 } 661 }
525} 662}
526 663
527############################################################################# 664#############################################################################
528 665
529package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
530 667
531our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
532 669
533sub new { 670sub new {
534 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
536} 673}
537 674
538sub size_request { 675sub size_request {
539 (0, 0) 676 my ($self) = @_;
677
678 ($self->{w} + 0, $self->{h} + 0)
540} 679}
541 680
542sub draw { } 681sub draw { }
543 682
544############################################################################# 683#############################################################################
545 684
546package CFClient::UI::Container; 685package CFPlus::UI::Container;
547 686
548our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
549 688
550sub new { 689sub new {
551 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
552 691
553 my $children = delete $arg{children} || []; 692 my $children = delete $arg{children};
554 693
555 my $self = $class->SUPER::new ( 694 my $self = $class->SUPER::new (
556 children => [], 695 children => [],
557 can_events => 0, 696 can_events => 0,
558 %arg, 697 %arg,
559 ); 698 );
699
560 $self->add ($_) for @$children; 700 $self->add (@$children)
701 if $children && @$children;
561 702
562 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
563} 712}
564 713
565sub add { 714sub add {
566 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
567 716
568 $_->set_parent ($self) 717 $_->set_parent ($self)
569 for @widgets; 718 for @widgets;
570 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
571 use sort 'stable'; 721 use sort 'stable';
572 722
573 $self->{children} = [ 723 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
576 ]; 726 ];
577 727
578 $self->check_size (1); 728 $self->realloc;
579 $self->update; 729
730 map $_+0, @widgets
580} 731}
581 732
582sub children { 733sub children {
583 @{ $_[0]{children} } 734 @{ $_[0]{children} }
584} 735}
… …
589 delete $child->{parent}; 740 delete $child->{parent};
590 $child->hide; 741 $child->hide;
591 742
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 744
594 $self->check_size; 745 $self->realloc;
595 $self->update;
596} 746}
597 747
598sub clear { 748sub clear {
599 my ($self) = @_; 749 my ($self) = @_;
600 750
601 my $children = delete $self->{children}; 751 my $children = $self->{children};
602 $self->{children} = []; 752 $self->{children} = [];
603 753
604 for (@$children) { 754 for (@$children) {
605 delete $_->{parent}; 755 delete $_->{parent};
606 $_->hide; 756 $_->hide;
607 } 757 }
608 758
609 $self->check_size; 759 $self->realloc;
610 $self->update;
611} 760}
612 761
613sub find_widget { 762sub find_widget {
614 my ($self, $x, $y) = @_; 763 my ($self, $x, $y) = @_;
615 764
616 $x -= $self->{x}; 765 $x -= $self->{x};
617 $y -= $self->{y}; 766 $y -= $self->{y};
618 767
619 my $res; 768 my $res;
620 769
621 for (reverse @{ $self->{children} }) { 770 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 771 $res = $_->find_widget ($x, $y)
623 and return $res; 772 and return $res;
624 } 773 }
625 774
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 775 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
632 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
633} 782}
634 783
635############################################################################# 784#############################################################################
636 785
637package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
638 787
639our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
640 789
641sub new { 790sub new {
642 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
643 792
644 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
645 794
646 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
647} 796}
648 797
649sub add { 798sub add {
650 my ($self, $child) = @_; 799 my ($self, $child) = @_;
651 800
652 $self->{children} = []; 801 $self->SUPER::remove ($_) for @{ $self->{children} };
653
654 $self->SUPER::add ($child); 802 $self->SUPER::add ($child);
655} 803}
656 804
657sub remove { 805sub remove {
658 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
659 807
660 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
661 809
662 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
663 unless @{$self->{children}}; 811 unless @{$self->{children}};
664} 812}
665 813
666sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
667 815
668sub size_request { 816sub size_request {
669 $_[0]{children}[0]->size_request 817 $_[0]{children}[0]->size_request
670} 818}
671 819
672sub size_allocate { 820sub invoke_size_allocate {
673 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
674 822
675 $self->{children}[0]->configure (0, 0, $w, $h); 823 $self->{children}[0]->configure (0, 0, $w, $h);
824
825 1
676} 826}
677 827
678############################################################################# 828#############################################################################
679 829
830# back-buffered drawing area
831
680package CFClient::UI::Window; 832package CFPlus::UI::Window;
681 833
682our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
683 835
684use CFClient::OpenGL; 836use CFPlus::OpenGL;
685 837
686sub new { 838sub new {
687 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
688 840
689 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
694 846
695 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 847 $ROOT->on_post_alloc ($self => sub { $self->render_child });
696 $self->SUPER::update; 848 $self->SUPER::update;
697} 849}
698 850
699sub size_allocate { 851sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 852 my ($self, $w, $h) = @_;
701 853
702 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 854 $self->update;
855
856 $self->SUPER::invoke_size_allocate ($w, $h)
704} 857}
705 858
706sub _render { 859sub _render {
860 my ($self) = @_;
861
707 $_[0]{children}[0]->draw; 862 $self->{children}[0]->draw;
708} 863}
709 864
710sub render_child { 865sub render_child {
711 my ($self) = @_; 866 my ($self) = @_;
712 867
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
716 871
872 {
873 package CFPlus::UI::Base;
874
875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h});
877
717 $self->_render; 878 $self->_render;
879 }
718 }; 880 };
719} 881}
720 882
721sub _draw { 883sub _draw {
722 my ($self) = @_; 884 my ($self) = @_;
723
724 my ($w, $h) = ($self->w, $self->h);
725 885
726 my $tex = $self->{texture} 886 my $tex = $self->{texture}
727 or return; 887 or return;
728 888
729 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 891 glColor 0, 0, 0, 1;
732 892
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
734 894
735 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
736} 896}
737 897
738############################################################################# 898#############################################################################
739 899
740package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
741 901
902use List::Util qw(min max);
903
742our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
905
906sub new {
907 my $class = shift;
908
909 $class->SUPER::new (
910 scroll_x => 0,
911 scroll_y => 1,
912 @_,
913 )
914}
743 915
744sub size_request { 916sub size_request {
745 my ($self) = @_; 917 my ($self) = @_;
746 918
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 920
749 @$self{qw(child_w child_h)} 921 $w = 1 if $self->{scroll_x};
750} 922 $h = 1 if $self->{scroll_y};
751 923
924 ($w, $h)
925}
926
752sub size_allocate { 927sub invoke_size_allocate {
753 my ($self, $w, $h) = @_; 928 my ($self, $w, $h) = @_;
754 929
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 930 my $child = $self->child;
756# $w = $self->{w}; 931
932 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
933 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
934
757 $self->child->configure (0, 0, $cw, $ch); 935 $self->child->configure (0, 0, $w, $h);
758 $self->update; 936 $self->update;
937
938 1
759} 939}
760 940
761sub set_offset { 941sub set_offset {
762 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
763 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
764 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
765 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
766 950
951 $self->emit (changed => $x, $y);
767 $self->update; 952 $self->update;
953 }
768} 954}
769 955
770# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
771sub coord2local { 957sub coord2local {
772 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
787 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
788 974
789 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
790 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
791 ) { 977 ) {
792 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
793 } else { 979 } else {
794 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
795 } 981 }
796} 982}
797 983
798sub _render { 984sub _render {
799 my ($self) = @_; 985 my ($self) = @_;
800 986
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
989
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 991
803 $self->SUPER::_render; 992 $self->SUPER::_render;
804} 993}
805 994
806############################################################################# 995#############################################################################
807 996
808package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
809 998
810our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
811 1000
812sub new { 1001sub new {
813 my $class = shift; 1002 my ($class, %arg) = @_;
1003
1004 my $child = delete $arg{child};
814 1005
815 my $self; 1006 my $self;
816 1007
817 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
818 vertical => 1, 1011 vertical => 0,
819 range => [0, 0, 1, 0.01], # HACK fix 1012 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 1013 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
822 }, 1016 },
823 ; 1017 ;
824 1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1022 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub {
1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1027 },
1028 ;
1029
825 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
827 slider => $slider, 1034 hslider => $hslider,
828 @_, 1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1038 %arg,
829 ); 1039 );
830 1040
831 $self->{vp}->add ($self->{scrolled}); 1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
832 $self->add ($self->{vp}); 1062 $self->SUPER::add ($self->{vp});
833 $self->add ($self->{slider}); 1063
1064 $self->add ($child) if $child;
834 1065
835 $self 1066 $self
836} 1067}
837 1068
838#TODO# update range on size_allocate depending on child 1069sub add {
839# update viewport offset on scroll 1070 my ($self, $widget) = @_;
1071
1072 $self->{vp}->add ($self->{child} = $widget);
1073}
1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1162}
1163
1164sub invoke_size_allocate {
1165 my ($self, $w, $h) = @_;
1166
1167 $self->update_slider;
1168 $self->SUPER::invoke_size_allocate ($w, $h)
1169}
840 1170
841############################################################################# 1171#############################################################################
842 1172
843package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
844 1174
845our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
846 1176
847use CFClient::OpenGL; 1177use CFPlus::OpenGL;
848 1178
849sub new { 1179sub new {
850 my $class = shift; 1180 my $class = shift;
851 1181
852 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
860 1190
861 if ($self->{bg}) { 1191 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1192 my ($w, $h) = @$self{qw(w h)};
863 1193
864 glEnable GL_BLEND; 1194 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1196 glColor_premultiply @{ $self->{bg} };
867 1197
868 glBegin GL_QUADS; 1198 glBegin GL_QUADS;
869 glVertex 0 , 0; 1199 glVertex 0 , 0;
870 glVertex 0 , $h; 1200 glVertex 0 , $h;
871 glVertex $w, $h; 1201 glVertex $w, $h;
… …
878 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
879} 1209}
880 1210
881############################################################################# 1211#############################################################################
882 1212
883package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
884 1214
885our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
886 1216
887use CFClient::OpenGL; 1217use CFPlus::OpenGL;
888
889my @tex =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1218
893sub new { 1219sub new {
894 my $class = shift; 1220 my ($class, %arg) = @_;
895 1221
896 # TODO: user_x, user_y, overwrite moveto? 1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
897 1229
898 my $self = $class->SUPER::new ( 1230 my $self = $class->SUPER::new (
1231 # label => "",
899 bg => [1, 1, 1, 1], 1232 fg => [0.6, 0.3, 0.1],
900 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1233 border => 0.8,
902 toplevel => 1, 1234 style => 'single',
903 can_events => 1, 1235 %arg,
904 @_
905 ); 1236 );
906 1237
907 $self->{title} &&= new CFClient::UI::Label
908 align => 0,
909 valign => 1,
910 text => $self->{title},
911 fontsize => $self->{border};
912
913 $self 1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
914} 1246}
915 1247
916sub border { 1248sub border {
917 int $_[0]{border} * $::FONTSIZE 1249 int $_[0]{border} * $::FONTSIZE
918} 1250}
919 1251
920sub size_request { 1252sub size_request {
921 my ($self) = @_; 1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
922 1257
923 my ($w, $h) = $self->SUPER::size_request; 1258 my ($w, $h) = $self->SUPER::size_request;
924 1259
925 ( 1260 (
926 $w + $self->border * 2, 1261 $w + $self->border * 2,
927 $h + $self->border * 2, 1262 $h + $self->border * 2,
928 ) 1263 )
929} 1264}
930 1265
931sub size_allocate { 1266sub invoke_size_allocate {
932 my ($self, $w, $h) = @_; 1267 my ($self, $w, $h) = @_;
933 1268
934 $h -= List::Util::max 0, $self->border * 2; 1269 my $border = $self->border;
1270
935 $w -= List::Util::max 0, $self->border * 2; 1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
936 1273
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1274 if (my $label = $self->{label}) {
938 if $self->{title}; 1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
939 1279
940 $self->child->configure ($self->border, $self->border, $w, $h); 1280 $self->child->configure ($border, $border, $w, $h);
941}
942 1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1318
1319my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1321 mipmap => 1, wrap => 1;
1322
1323my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1331sub new {
1332 my ($class, %arg) = @_;
1333
1334 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1],
1337 border => 0.6,
1338 can_events => 1,
1339 min_w => 64,
1340 min_h => 32,
1341 %arg,
1342 );
1343
1344 $self->{title_widget} = new CFPlus::UI::Label
1345 align => 0,
1346 valign => 1,
1347 text => $self->{title},
1348 fontsize => $self->{border},
1349 if exists $self->{title};
1350
1351 if ($self->{has_close_button}) {
1352 $self->{close_button} =
1353 new CFPlus::UI::ImageButton
1354 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") };
1356
1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1358 }
1359
1360 $self
1361}
1362
1363sub add {
1364 my ($self, @widgets) = @_;
1365
1366 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369}
1370
1371sub border {
1372 int $_[0]{border} * $::FONTSIZE
1373}
1374
1375sub size_request {
1376 my ($self) = @_;
1377
1378 $self->{title_widget}->size_request
1379 if $self->{title_widget};
1380
1381 $self->{close_button}->size_request
1382 if $self->{close_button};
1383
1384 my ($w, $h) = $self->SUPER::size_request;
1385
1386 (
1387 $w + $self->border * 2,
1388 $h + $self->border * 2,
1389 )
1390}
1391
1392sub invoke_size_allocate {
1393 my ($self, $w, $h) = @_;
1394
1395 if ($self->{title_widget}) {
1396 $self->{title_widget}{w} = $w;
1397 $self->{title_widget}{h} = $h;
1398 $self->{title_widget}->invoke_size_allocate ($w, $h);
1399 }
1400
1401 my $border = $self->border;
1402
1403 $h -= List::Util::max 0, $border * 2;
1404 $w -= List::Util::max 0, $border * 2;
1405
1406 $self->child->configure ($border, $border, $w, $h);
1407
1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1409 if $self->{close_button};
1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1419 1
1420}
1421
943sub button_down { 1422sub invoke_button_down {
944 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
945 1424
946 my ($w, $h) = @$self{qw(w h)}; 1425 my ($w, $h) = @$self{qw(w h)};
947 my $border = $self->border; 1426 my $border = $self->border;
948 1427
… …
961 my ($ev, $x, $y) = @_; 1440 my ($ev, $x, $y) = @_;
962 1441
963 my $dx = $ev->{x} - $ox; 1442 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1443 my $dy = $ev->{y} - $oy;
965 1444
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1445 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1446 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1447
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1448 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1449 $self->realloc;
970 }; 1450 };
971 1451
972 } elsif ($lr ^ $td) { 1452 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1453 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1454 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1456 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1457 my ($ev, $x, $y) = @_;
978 1458
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1459 ($x, $y) = ($ev->{x}, $ev->{y});
980 1460
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1461 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1462 # HACK: the next line is required to enforce placement
1463 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1464 };
1465 } else {
1466 return 0;
1467 }
1468
984 } 1469 1
985} 1470}
986 1471
987sub button_up { 1472sub invoke_button_up {
988 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
989 1474
990 delete $self->{motion}; 1475 ! ! delete $self->{motion}
991} 1476}
992 1477
993sub mouse_motion { 1478sub invoke_mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1479 my ($self, $ev, $x, $y) = @_;
995 1480
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1482
1483 ! ! $self->{motion}
1484}
1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
997} 1492}
998 1493
999sub _draw { 1494sub _draw {
1000 my ($self) = @_; 1495 my ($self) = @_;
1001 1496
1497 my $child = $self->{children}[0];
1498
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1499 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1500 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1501
1005 glEnable GL_TEXTURE_2D; 1502 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1504
1008 my $border = $self->border; 1505 my $border = $self->border;
1009 1506
1010 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1015 1526
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1528 glColor @{ $self->{bg} };
1018 1529
1019 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
1531 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1532 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1533 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1534 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1535 }
1030 1536
1031 glDisable GL_TEXTURE_2D; 1537 glDisable GL_TEXTURE_2D;
1032 1538
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1539 $child->draw;
1540
1541 if ($self->{title_widget}) {
1542 glTranslate 0, $border - $self->{h};
1543 $self->{title_widget}->_draw;
1544
1545 glTranslate 0, - ($border - $self->{h});
1546 }
1547
1548 $self->{close_button}->draw
1549 if $self->{close_button};
1036} 1550}
1037 1551
1038############################################################################# 1552#############################################################################
1039 1553
1040package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1041 1555
1042our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1043 1557
1044use List::Util qw(max sum); 1558use List::Util qw(max sum);
1045 1559
1046use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1047 1561
1048sub new { 1562sub new {
1049 my $class = shift; 1563 my $class = shift;
1050 1564
1051 $class->SUPER::new ( 1565 $class->SUPER::new (
1052 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1053 @_ 1568 @_,
1054 ) 1569 )
1055} 1570}
1056 1571
1057sub add { 1572sub add {
1058 my ($self, $x, $y, $child) = @_;
1059
1060 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child;
1062
1063 $child->check_size;
1064}
1065
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal?
1071sub clear {
1072 my ($self) = @_; 1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1601 my ($self) = @_;
1602
1603 my (@w, @h);
1073 1604
1074 my @children = $self->children; 1605 my @children = $self->children;
1075 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1076 1616 }
1077 for (@children) {
1078 delete $_->{parent};
1079 $_->hide;
1080 }
1081 1617
1082 $self->update; 1618 # second pass, rows
1083} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1084
1085sub get_wh {
1086 my ($self) = @_;
1087
1088 my (@w, @h);
1089
1090 for my $y (0 .. $#{$self->{children}}) {
1091 my $row = $self->{children}[$y]
1092 or next;
1093
1094 for my $x (0 .. $#$row) {
1095 my $widget = $row->[$x]
1096 or next;
1097 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1098 1621
1099 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1100 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1101 } 1626 }
1102 } 1627 }
1103 1628
1104 (\@w, \@h) 1629 (\@w, \@h)
1105} 1630}
… …
1113 (sum @$ws), 1638 (sum @$ws),
1114 (sum @$hs), 1639 (sum @$hs),
1115 ) 1640 )
1116} 1641}
1117 1642
1118sub size_allocate { 1643sub invoke_size_allocate {
1119 my ($self, $w, $h) = @_; 1644 my ($self, $w, $h) = @_;
1120 1645
1121 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1122 1647
1123 my $req_w = sum @$ws; 1648 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1649 my $req_h = (sum @$hs) || 1;
1125 1650
1126 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1127 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1130 1655
1131 # linearly scale sizes
1132 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1133 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1134 1657
1135 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1136 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1137 1667
1138 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1139 1670
1140 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1141 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1142 or next;
1143 1673
1144 my $x = 0; 1674 $widget->configure (
1145 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1146 1677 );
1147 for my $c (0 .. $#$row) { 1678 }
1148 my $col_w = $ws->[$c];
1149 1679
1150 if (my $widget = $row->[$c]) { 1680 1
1151 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1152 }
1153 1682
1154 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub _scale($$$) {
1692 my ($rel, $val, $max) = @_;
1693
1694 $rel ? $val * $max : $val
1695}
1696
1697sub size_request {
1698 my ($self) = @_;
1699
1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1701
1702 # determine overall size by querying abs widgets
1703 for my $child ($self->visible_children) {
1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1707
1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1155 } 1710 }
1156
1157 $y += $row_h;
1158 } 1711 }
1159 1712
1160} 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1161 1715
1162sub find_widget { 1716 # now layout remaining widgets
1717 for my $child ($self->visible_children) {
1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1721
1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1724 }
1725 }
1726
1727 my $W = $x2 - $x1;
1728 my $H = $y2 - $y1;
1729
1730 ($W, $H)
1731}
1732
1733sub invoke_size_allocate {
1163 my ($self, $x, $y) = @_; 1734 my ($self, $W, $H) = @_;
1164 1735
1165 $x -= $self->{x}; 1736 for my $child ($self->visible_children) {
1166 $y -= $self->{y}; 1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1167 1739
1168 my $res; 1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1169 1742
1170 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1171 $res = $_->find_widget ($x, $y) 1744 }
1172 and return $res; 1745
1173 } 1746 1
1174
1175 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1176}
1177
1178sub _draw {
1179 my ($self) = @_;
1180
1181 for (grep $_, @{$self->{children}}) {
1182 $_->draw for grep $_, @$_;
1183 }
1184} 1747}
1185 1748
1186############################################################################# 1749#############################################################################
1187 1750
1188package CFClient::UI::HBox; 1751package CFPlus::UI::Box;
1189 1752
1190# TODO: wrap into common Box base class
1191
1192our @ISA = CFClient::UI::Container::; 1753our @ISA = CFPlus::UI::Container::;
1193 1754
1194sub size_request { 1755sub size_request {
1195 my ($self) = @_; 1756 my ($self) = @_;
1196 1757
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1758 $self->{vertical}
1759 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1762 )
1763 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1766 )
1767}
1198 1768
1769sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_;
1771
1772 my $space = $self->{vertical} ? $h : $w;
1773 my @children = $self->visible_children;
1774
1775 my @req;
1776
1777 if ($self->{homogeneous}) {
1778 @req = ($space / (@children || 1)) x @children;
1779 } else {
1780 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1781 my $req = List::Util::sum @req;
1782
1783 if ($req > $space) {
1784 # ah well, not enough space
1785 $_ *= $space / $req for @req;
1786 } else {
1787 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1788
1789 $space = ($space - $req) / $expand; # remaining space to give away
1790
1791 $req[$_] += $space * $children[$_]{expand}
1792 for 0 .. $#children;
1793 }
1199 ( 1794 }
1200 (List::Util::sum map $_->[0], @alloc), 1795
1201 (List::Util::max map $_->[1], @alloc), 1796 CFPlus::UI::harmonize \@req;
1797
1798 my $pos = 0;
1799 for (0 .. $#children) {
1800 my $alloc = $req[$_];
1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1802
1803 $pos += $alloc;
1804 }
1805
1806 1
1807}
1808
1809#############################################################################
1810
1811package CFPlus::UI::HBox;
1812
1813our @ISA = CFPlus::UI::Box::;
1814
1815sub new {
1816 my $class = shift;
1817
1818 $class->SUPER::new (
1819 vertical => 0,
1820 @_,
1202 ) 1821 )
1203} 1822}
1204 1823
1205sub size_allocate {
1206 my ($self, $w, $h) = @_;
1207
1208 ($h, $w) = ($w, $h);
1209
1210 my $children = $self->{children};
1211
1212 my @h = map $_->{req_w}, @$children;
1213
1214 my $req_h = List::Util::sum @h;
1215
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children;
1221 $exp ||= 1;
1222
1223 for (0 .. $#$children) {
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure ($y, 0, $h, $w);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1824#############################################################################
1247 1825
1248package CFClient::UI::VBox; 1826package CFPlus::UI::VBox;
1249 1827
1250# TODO: wrap into common Box base class 1828our @ISA = CFPlus::UI::Box::;
1251 1829
1252our @ISA = CFClient::UI::Container::; 1830sub new {
1831 my $class = shift;
1253 1832
1254sub size_request { 1833 $class->SUPER::new (
1255 my ($self) = @_; 1834 vertical => 1,
1256 1835 @_,
1257 my @alloc = map [$_->size_request], @{$self->{children}};
1258
1259 (
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1836 )
1263} 1837}
1264 1838
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302}
1303
1304############################################################################# 1839#############################################################################
1305 1840
1306package CFClient::UI::Label; 1841package CFPlus::UI::Label;
1307 1842
1308our @ISA = CFClient::UI::DrawBG::; 1843our @ISA = CFPlus::UI::DrawBG::;
1309 1844
1310use CFClient::OpenGL; 1845use CFPlus::OpenGL;
1311 1846
1312sub new { 1847sub new {
1313 my ($class, %arg) = @_; 1848 my ($class, %arg) = @_;
1314 1849
1315 my $self = $class->SUPER::new ( 1850 my $self = $class->SUPER::new (
… …
1318 #active_bg => none 1853 #active_bg => none
1319 #font => default_font 1854 #font => default_font
1320 #text => initial text 1855 #text => initial text
1321 #markup => initial narkup 1856 #markup => initial narkup
1322 #max_w => maximum pixel width 1857 #max_w => maximum pixel width
1858 #style => 0, # render flags
1323 ellipsise => 3, # end 1859 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1860 layout => (new CFPlus::Layout),
1325 fontsize => 1, 1861 fontsize => 1,
1326 align => -1, 1862 align => -1,
1327 valign => -1, 1863 valign => -1,
1328 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1329 can_events => 0, 1866 can_events => 0,
1330 %arg 1867 %arg
1331 ); 1868 );
1332 1869
1333 if (exists $self->{template}) { 1870 if (exists $self->{template}) {
1334 my $layout = new CFClient::Layout; 1871 my $layout = new CFPlus::Layout;
1335 $layout->set_text (delete $self->{template}); 1872 $layout->set_text (delete $self->{template});
1336 $self->{template} = $layout; 1873 $self->{template} = $layout;
1337 } 1874 }
1338 1875
1339 if (exists $self->{markup}) { 1876 if (exists $self->{markup}) {
… …
1343 } 1880 }
1344 1881
1345 $self 1882 $self
1346} 1883}
1347 1884
1348sub escape($) {
1349 local $_ = $_[0];
1350
1351 s/&/&amp;/g;
1352 s/>/&gt;/g;
1353 s/</&lt;/g;
1354
1355 $_
1356}
1357
1358sub update { 1885sub update {
1359 my ($self) = @_; 1886 my ($self) = @_;
1360 1887
1361 delete $self->{texture}; 1888 delete $self->{texture};
1362 $self->SUPER::update; 1889 $self->SUPER::update;
1363} 1890}
1364 1891
1892sub realloc {
1893 my ($self) = @_;
1894
1895 delete $self->{ox};
1896 $self->SUPER::realloc;
1897}
1898
1365sub set_text { 1899sub set_text {
1366 my ($self, $text) = @_; 1900 my ($self, $text) = @_;
1367 1901
1368 return if $self->{text} eq "T$text"; 1902 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1903 $self->{text} = "T$text";
1370 1904
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1905 $self->{layout}->set_text ($text);
1373 1906
1907 delete $self->{size_req};
1908 $self->realloc;
1374 $self->update; 1909 $self->update;
1375 $self->check_size;
1376} 1910}
1377 1911
1378sub set_markup { 1912sub set_markup {
1379 my ($self, $markup) = @_; 1913 my ($self, $markup) = @_;
1380 1914
1381 return if $self->{text} eq "M$markup"; 1915 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup"; 1916 $self->{text} = "M$markup";
1383 1917
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1918 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1919
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1920 $self->{layout}->set_markup ($markup);
1388 1921
1922 delete $self->{size_req};
1923 $self->realloc;
1389 $self->update; 1924 $self->update;
1390 $self->check_size;
1391} 1925}
1392 1926
1393sub size_request { 1927sub size_request {
1394 my ($self) = @_; 1928 my ($self) = @_;
1395 1929
1930 $self->{size_req} ||= do {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1931 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1932 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1933 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1934 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1935 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1936
1402 my ($w, $h) = $self->{layout}->size; 1937 my ($w, $h) = $self->{layout}->size;
1403 1938
1404 if (exists $self->{template}) { 1939 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font}; 1940 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1);
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1943
1408 my ($w2, $h2) = $self->{template}->size; 1944 my ($w2, $h2) = $self->{template}->size;
1409 1945
1410 $w = List::Util::max $w, $w2; 1946 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1947 $h = List::Util::max $h, $h2;
1948 }
1949
1950 [$w, $h]
1412 } 1951 };
1413 1952
1414 ( 1953 @{ $self->{size_req} }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1954}
1419 1955
1956sub baseline_shift {
1957 $_[0]{layout}->descent
1958}
1959
1420sub size_allocate { 1960sub invoke_size_allocate {
1421 my ($self, $w, $h) = @_; 1961 my ($self, $w, $h) = @_;
1422 1962
1963 delete $self->{ox};
1964
1423 delete $self->{texture}; 1965 delete $self->{texture}
1966 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1967
1968 1
1424} 1969}
1425 1970
1426sub set_fontsize { 1971sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1972 my ($self, $fontsize) = @_;
1428 1973
1429 $self->{fontsize} = $fontsize; 1974 $self->{fontsize} = $fontsize;
1975 delete $self->{size_req};
1430 delete $self->{texture}; 1976 delete $self->{texture};
1431 1977
1432 $self->update; 1978 $self->realloc;
1433 $self->check_size; 1979}
1980
1981sub reconfigure {
1982 my ($self) = @_;
1983
1984 delete $self->{size_req};
1985 delete $self->{texture};
1986
1987 $self->SUPER::reconfigure;
1434} 1988}
1435 1989
1436sub _draw { 1990sub _draw {
1437 my ($self) = @_; 1991 my ($self) = @_;
1438 1992
1439 $self->SUPER::_draw; # draw background, if applicable 1993 $self->SUPER::_draw; # draw background, if applicable
1440 1994
1441 my $tex = $self->{texture} ||= do { 1995 my $size = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}}); 1996 $self->{layout}->set_foreground (@{$self->{fg}});
1443 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1444 $self->{layout}->set_width ($self->{w}); 1998 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 2002
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2003 [$self->{layout}->size]
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 2004 };
1461 2005
1462 glEnable GL_TEXTURE_2D; 2006 unless (exists $self->{ox}) {
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2009 : ($self->{w} - $size->[0]) * 0.5);
1464 2010
1465 if ($tex->{format} == GL_ALPHA) { 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1466 glColor @{$self->{fg}}; 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2013 : ($self->{h} - $size->[1]) * 0.5);
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 } 2014 };
1471 2015
1472 glDisable GL_TEXTURE_2D; 2016# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList;
2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
2024
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1473} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
1474 2035
1475############################################################################# 2036#############################################################################
1476 2037
1477package CFClient::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1478 2039
1479our @ISA = CFClient::UI::Label::; 2040our @ISA = CFPlus::UI::Label::;
1480 2041
1481use CFClient::OpenGL; 2042use CFPlus::OpenGL;
1482 2043
1483sub new { 2044sub new {
1484 my $class = shift; 2045 my $class = shift;
1485 2046
1486 $class->SUPER::new ( 2047 $class->SUPER::new (
… …
1490 active_fg => [0, 0, 0], 2051 active_fg => [0, 0, 0],
1491 can_hover => 1, 2052 can_hover => 1,
1492 can_focus => 1, 2053 can_focus => 1,
1493 valign => 0, 2054 valign => 0,
1494 can_events => 1, 2055 can_events => 1,
2056 ellipsise => 0,
1495 #text => ... 2057 #text => ...
2058 #hidden => "*",
1496 @_ 2059 @_
1497 ) 2060 )
1498} 2061}
1499 2062
1500sub _set_text { 2063sub _set_text {
… …
1502 2065
1503 delete $self->{cur_h}; 2066 delete $self->{cur_h};
1504 2067
1505 return if $self->{text} eq $text; 2068 return if $self->{text} eq $text;
1506 2069
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 2070 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 2071 $self->{text} = $text;
1511 2072
1512 $text =~ s/./*/g if $self->{hidden}; 2073 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 2074 $self->{layout}->set_text ("$text ");
2075 delete $self->{size_req};
1514 2076
1515 $self->emit (changed => $self->{text}); 2077 $self->emit (changed => $self->{text});
2078
2079 $self->realloc;
2080 $self->update;
1516} 2081}
1517 2082
1518sub set_text { 2083sub set_text {
1519 my ($self, $text) = @_; 2084 my ($self, $text) = @_;
1520 2085
1521 $self->{cursor} = length $text; 2086 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 2087 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 2088}
1526 2089
1527sub get_text { 2090sub get_text {
1528 $_[0]{text} 2091 $_[0]{text}
1529} 2092}
… …
1534 my ($w, $h) = $self->SUPER::size_request; 2097 my ($w, $h) = $self->SUPER::size_request;
1535 2098
1536 ($w + 1, $h) # add 1 for cursor 2099 ($w + 1, $h) # add 1 for cursor
1537} 2100}
1538 2101
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543}
1544
1545sub key_down { 2102sub invoke_key_down {
1546 my ($self, $ev) = @_; 2103 my ($self, $ev) = @_;
1547 2104
1548 my $mod = $ev->{mod}; 2105 my $mod = $ev->{mod};
1549 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1550 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1551 2108
1552 my $text = $self->get_text; 2109 my $text = $self->get_text;
2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1553 2112
1554 if ($uni == 8) { 2113 if ($uni == 8) {
1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1556 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1557 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1558 } elsif ($sym == CFClient::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1559 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1560 } elsif ($sym == CFClient::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1561 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1562 } elsif ($sym == CFClient::SDLK_HOME) { 2121 } elsif ($sym == CFPlus::SDLK_HOME) {
2122 # what a hack
2123 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1
2126 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) {
2128 # uh, again
2129 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1
2132 : length $self->{text};
2133 } elsif ($uni == 21) { # ctrl-u
2134 $text = "";
1563 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 2137 $self->emit ('escape');
1568 } elsif ($uni) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
2142 } else {
2143 return 0;
1570 } 2144 }
1571 2145
1572 $self->_set_text ($text); 2146 $self->_set_text ($text);
2147
2148 $self->realloc;
1573 $self->update; 2149 $self->update;
1574 $self->check_size;
1575}
1576 2150
2151 1
2152}
2153
1577sub focus_in { 2154sub invoke_focus_in {
1578 my ($self) = @_; 2155 my ($self) = @_;
1579 2156
1580 $self->{last_activity} = $::NOW; 2157 $self->{last_activity} = $::NOW;
1581 2158
1582 $self->SUPER::focus_in; 2159 $self->SUPER::invoke_focus_in
1583} 2160}
1584 2161
1585sub button_down { 2162sub invoke_button_down {
1586 my ($self, $ev, $x, $y) = @_; 2163 my ($self, $ev, $x, $y) = @_;
1587 2164
1588 $self->SUPER::button_down ($ev, $x, $y); 2165 $self->SUPER::invoke_button_down ($ev, $x, $y);
1589 2166
1590 my $idx = $self->{layout}->xy_to_index ($x, $y); 2167 my $idx = $self->{layout}->xy_to_index ($x, $y);
1591 2168
1592 # byte-index to char-index 2169 # byte-index to char-index
1593 my $text = $self->{text}; 2170 my $text = $self->{text};
1594 utf8::encode $text; 2171 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 2172 $self->{cursor} = length $text;
1596 2173
1597 $self->_set_text ($self->{text}); 2174 $self->_set_text ($self->{text});
1598 $self->update; 2175 $self->update;
2176
2177 1
1599} 2178}
1600 2179
1601sub mouse_motion { 2180sub invoke_mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 2181 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2182# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2183
2184 1
1604} 2185}
1605 2186
1606sub _draw { 2187sub _draw {
1607 my ($self) = @_; 2188 my ($self) = @_;
1608 2189
1609 local $self->{fg} = $self->{fg}; 2190 local $self->{fg} = $self->{fg};
1610 2191
1611 if ($FOCUS == $self) { 2192 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 2193 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 2194 $self->{fg} = $self->{active_fg};
1614 } else { 2195 } else {
1615 glColor @{$self->{bg}}; 2196 glColor_premultiply @{$self->{bg}};
1616 } 2197 }
1617 2198
1618 glEnable GL_BLEND; 2199 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 2201 glBegin GL_QUADS;
1621 glVertex 0 , 0; 2202 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 2203 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 2204 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 2205 glVertex $self->{w}, 0;
… …
1635 utf8::encode $text; 2216 utf8::encode $text;
1636 2217
1637 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1638 } 2219 }
1639 2220
1640 glColor @{$self->{fg}};
1641 glBegin GL_LINES; 2221 glBegin GL_LINES;
1642 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1643 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1644 glEnd; 2224 glEnd;
1645 } 2225 }
1646} 2226}
1647 2227
2228#############################################################################
2229
1648package CFClient::UI::Entry; 2230package CFPlus::UI::Entry;
1649 2231
1650our @ISA = CFClient::UI::EntryBase::; 2232our @ISA = CFPlus::UI::EntryBase::;
1651 2233
1652use CFClient::OpenGL; 2234use CFPlus::OpenGL;
1653 2235
1654sub key_down { 2236sub invoke_key_down {
1655 my ($self, $ev) = @_; 2237 my ($self, $ev) = @_;
1656 2238
1657 my $sym = $ev->{sym}; 2239 my $sym = $ev->{sym};
1658 2240
1659 if ($sym == 13) { 2241 if ($ev->{uni} == 0x0d || $sym == 13) {
1660 unshift @{$self->{history}}, 2242 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 2243 my $txt = $self->get_text;
2244
1662 $self->{history_pointer} = -1; 2245 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 2246 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 2247 $self->emit (activate => $txt);
1665 $self->update; 2248 $self->update;
1666 2249
1667 } elsif ($sym == CFClient::SDLK_UP) { 2250 } elsif ($sym == CFPlus::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 2251 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 2252 $self->{history_saveback} = $self->get_text;
1670 } 2253 }
1671 if (@{$self->{history} || []} > 0) { 2254 if (@{$self->{history} || []} > 0) {
1672 $self->{history_pointer}++; 2255 $self->{history_pointer}++;
… …
1674 $self->{history_pointer} = @{$self->{history} || []} - 1; 2257 $self->{history_pointer} = @{$self->{history} || []} - 1;
1675 } 2258 }
1676 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2259 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1677 } 2260 }
1678 2261
1679 } elsif ($sym == CFClient::SDLK_DOWN) { 2262 } elsif ($sym == CFPlus::SDLK_DOWN) {
1680 $self->{history_pointer}--; 2263 $self->{history_pointer}--;
1681 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1682 2265
1683 if ($self->{history_pointer} >= 0) { 2266 if ($self->{history_pointer} >= 0) {
1684 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2267 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1685 } else { 2268 } else {
1686 $self->set_text ($self->{history_saveback}); 2269 $self->set_text ($self->{history_saveback});
1687 } 2270 }
1688 2271
1689 } else { 2272 } else {
1690 $self->SUPER::key_down ($ev); 2273 return $self->SUPER::invoke_key_down ($ev)
2274 }
2275
1691 } 2276 1
1692
1693} 2277}
1694 2278
1695############################################################################# 2279#############################################################################
1696 2280
2281package CFPlus::UI::TextEdit;
2282
2283our @ISA = CFPlus::UI::EntryBase::;
2284
2285use CFPlus::OpenGL;
2286
2287sub move_cursor_ver {
2288 my ($self, $dy) = @_;
2289
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291
2292 $y += $dy;
2293
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2295 $self->{cursor} = $index;
2296 delete $self->{cur_h};
2297 $self->update;
2298 return;
2299 }
2300}
2301
2302sub invoke_key_down {
2303 my ($self, $ev) = @_;
2304
2305 my $sym = $ev->{sym};
2306
2307 if ($sym == CFPlus::SDLK_UP) {
2308 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1);
2311 } else {
2312 return $self->SUPER::invoke_key_down ($ev)
2313 }
2314
2315 1
2316}
2317
2318#############################################################################
2319
1697package CFClient::UI::Button; 2320package CFPlus::UI::Button;
1698 2321
1699our @ISA = CFClient::UI::Label::; 2322our @ISA = CFPlus::UI::Label::;
1700 2323
1701use CFClient::OpenGL; 2324use CFPlus::OpenGL;
1702 2325
1703my @tex = 2326my @tex =
1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1705 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
1706 2329
1707sub new { 2330sub new {
1708 my $class = shift; 2331 my $class = shift;
1709 2332
1710 $class->SUPER::new ( 2333 $class->SUPER::new (
1711 padding => 4, 2334 padding_x => 4,
2335 padding_y => 4,
1712 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
1713 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
1714 can_hover => 1, 2338 can_hover => 1,
1715 align => 0, 2339 align => 0,
1716 valign => 0, 2340 valign => 0,
1717 can_events => 1, 2341 can_events => 1,
1718 @_ 2342 @_
1719 ) 2343 )
1720} 2344}
1721 2345
1722sub button_up { 2346sub invoke_button_up {
1723 my ($self, $ev, $x, $y) = @_; 2347 my ($self, $ev, $x, $y) = @_;
1724 2348
2349 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 2350 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 2351 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 2352
1728 } 2353 1
1729} 2354}
1730 2355
1731sub _draw { 2356sub _draw {
1732 my ($self) = @_; 2357 my ($self) = @_;
1733 2358
1734 local $self->{fg} = $self->{fg}; 2359 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 2360
1740 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
1743 2364
2365 my $tex = $tex[$GRAB == $self];
1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1745 2367
1746 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
1747 2369
1748 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
1749} 2371}
1750 2372
1751############################################################################# 2373#############################################################################
1752 2374
1753package CFClient::UI::CheckBox; 2375package CFPlus::UI::CheckBox;
1754 2376
1755our @ISA = CFClient::UI::DrawBG::; 2377our @ISA = CFPlus::UI::DrawBG::;
1756 2378
1757my @tex = 2379my @tex =
1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1759 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2381 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1760 2382
1761use CFClient::OpenGL; 2383use CFPlus::OpenGL;
1762 2384
1763sub new { 2385sub new {
1764 my $class = shift; 2386 my $class = shift;
1765 2387
1766 $class->SUPER::new ( 2388 $class->SUPER::new (
1767 padding => 2, 2389 padding_x => 2,
2390 padding_y => 2,
1768 fg => [1, 1, 1], 2391 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 2392 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 2393 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 2394 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 2395 state => 0,
… …
1776} 2399}
1777 2400
1778sub size_request { 2401sub size_request {
1779 my ($self) = @_; 2402 my ($self) = @_;
1780 2403
1781 ($self->{padding} * 2 + 6) x 2 2404 (6) x 2
1782} 2405}
1783 2406
2407sub toggle {
2408 my ($self) = @_;
2409
2410 $self->{state} = !$self->{state};
2411 $self->emit (changed => $self->{state});
2412 $self->update;
2413}
2414
1784sub button_down { 2415sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2416 my ($self, $ev, $x, $y) = @_;
1786 2417
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2418 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2419 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 2420 $self->toggle;
1790 $self->emit (changed => $self->{state}); 2421 } else {
2422 return 0
2423 }
2424
1791 } 2425 1
1792} 2426}
1793 2427
1794sub _draw { 2428sub _draw {
1795 my ($self) = @_; 2429 my ($self) = @_;
1796 2430
1797 $self->SUPER::_draw; 2431 $self->SUPER::_draw;
1798 2432
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2434
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2435 my ($w, $h) = @$self{qw(w h)};
2436
2437 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 2438
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2439 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2440
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2441 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2442
… …
1809 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
1810} 2446}
1811 2447
1812############################################################################# 2448#############################################################################
1813 2449
1814package CFClient::UI::Image; 2450package CFPlus::UI::Image;
1815 2451
1816our @ISA = CFClient::UI::Base::; 2452our @ISA = CFPlus::UI::Base::;
1817 2453
1818use CFClient::OpenGL; 2454use CFPlus::OpenGL;
1819use Carp qw/confess/;
1820 2455
1821our %loaded_images; 2456our %texture_cache;
1822 2457
1823sub new { 2458sub new {
1824 my $class = shift; 2459 my $class = shift;
1825 2460
1826 my $self = $class->SUPER::new (can_events => 0, @_); 2461 my $self = $class->SUPER::new (
2462 can_events => 0,
2463 @_,
2464 );
1827 2465
1828 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2466 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required";
1829 2468
1830 $loaded_images{$self->{image}} ||= 2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1831 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1832 2471
1833 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2472 CFPlus::weaken $texture_cache{$self->{path}};
1834 2473
1835 Scalar::Util::weaken $loaded_images{$self->{image}}; 2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1836
1837 $self->{aspect} = $tex->{w} / $tex->{h};
1838 2475
1839 $self 2476 $self
1840} 2477}
1841 2478
2479sub STORABLE_freeze {
2480 my ($self, $cloning) = @_;
2481
2482 $self->{path}
2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2484
2485 $self->{path}
2486}
2487
2488sub STORABLE_attach {
2489 my ($self, $cloning, $path) = @_;
2490
2491 $self->new (path => $path)
2492}
2493
1842sub size_request { 2494sub size_request {
1843 my ($self) = @_; 2495 my ($self) = @_;
1844 2496
1845 ($self->{tex}->{w}, $self->{tex}->{h}) 2497 ($self->{tex}{w}, $self->{tex}{h})
1846} 2498}
1847 2499
1848sub _draw { 2500sub _draw {
1849 my ($self) = @_; 2501 my ($self) = @_;
1850 2502
… …
1860 } 2512 }
1861 2513
1862 glEnable GL_TEXTURE_2D; 2514 glEnable GL_TEXTURE_2D;
1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1864 2516
1865 $tex->draw_quad_alpha (0, 0, $w, $h); 2517 $tex->draw_quad (0, 0, $w, $h);
1866 2518
1867 glDisable GL_TEXTURE_2D; 2519 glDisable GL_TEXTURE_2D;
1868} 2520}
1869 2521
1870############################################################################# 2522#############################################################################
1871 2523
2524package CFPlus::UI::ImageButton;
2525
2526our @ISA = CFPlus::UI::Image::;
2527
2528use CFPlus::OpenGL;
2529
2530my %textures;
2531
2532sub new {
2533 my $class = shift;
2534
2535 my $self = $class->SUPER::new (
2536 padding_x => 4,
2537 padding_y => 4,
2538 fg => [1, 1, 1],
2539 active_fg => [0, 0, 1],
2540 can_hover => 1,
2541 align => 0,
2542 valign => 0,
2543 can_events => 1,
2544 @_
2545 );
2546}
2547
2548sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_;
2550
2551 $self->emit ("activate")
2552 if $x >= 0 && $x < $self->{w}
2553 && $y >= 0 && $y < $self->{h};
2554
2555 1
2556}
2557
2558#############################################################################
2559
1872package CFClient::UI::VGauge; 2560package CFPlus::UI::VGauge;
1873 2561
1874our @ISA = CFClient::UI::Base::; 2562our @ISA = CFPlus::UI::Base::;
1875 2563
1876use List::Util qw(min max); 2564use List::Util qw(min max);
1877 2565
1878use CFClient::OpenGL; 2566use CFPlus::OpenGL;
1879 2567
1880my %tex = ( 2568my %tex = (
1881 food => [ 2569 food => [
1882 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1883 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1884 ], 2572 ],
1885 grace => [ 2573 grace => [
1886 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1887 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1888 ], 2576 ],
1889 hp => [ 2577 hp => [
1890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1891 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1892 ], 2580 ],
1893 mana => [ 2581 mana => [
1894 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1895 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1896 ], 2584 ],
1897); 2585);
1898 2586
1899# eg. VGauge->new (gauge => 'food'), default gauge: food 2587# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1959 my $ycut1 = max 0, min 1, $ycut; 2647 my $ycut1 = max 0, min 1, $ycut;
1960 my $ycut2 = max 0, min 1, $ycut - 1; 2648 my $ycut2 = max 0, min 1, $ycut - 1;
1961 2649
1962 my $h1 = $self->{h} * (1 - $ycut1); 2650 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2651 my $h2 = $self->{h} * (1 - $ycut2);
2652 my $h3 = $self->{h};
2653
2654 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1964 2655
1965 glEnable GL_BLEND; 2656 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2657 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2658 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2661
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2662 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2663 glBegin GL_QUADS;
… …
1986 2678
1987 if ($t3) { 2679 if ($t3) {
1988 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2680 glBindTexture GL_TEXTURE_2D, $t3->{name};
1989 glBegin GL_QUADS; 2681 glBegin GL_QUADS;
1990 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2682 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1991 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2683 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1992 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2684 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1993 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2685 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1994 glEnd; 2686 glEnd;
1995 } 2687 }
1996 2688
1997 glDisable GL_BLEND; 2689 glDisable GL_BLEND;
1998 glDisable GL_TEXTURE_2D; 2690 glDisable GL_TEXTURE_2D;
1999} 2691}
2000 2692
2001############################################################################# 2693#############################################################################
2002 2694
2003package CFClient::UI::Gauge; 2695package CFPlus::UI::Gauge;
2004 2696
2005our @ISA = CFClient::UI::VBox::; 2697our @ISA = CFPlus::UI::VBox::;
2006 2698
2007sub new { 2699sub new {
2008 my ($class, %arg) = @_; 2700 my ($class, %arg) = @_;
2009 2701
2010 my $self = $class->SUPER::new ( 2702 my $self = $class->SUPER::new (
… …
2012 can_hover => 1, 2704 can_hover => 1,
2013 can_events => 1, 2705 can_events => 1,
2014 %arg, 2706 %arg,
2015 ); 2707 );
2016 2708
2017 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2709 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2018 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2710 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2019 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2020 2712
2021 $self 2713 $self
2022} 2714}
2023 2715
2024sub set_fontsize { 2716sub set_fontsize {
… …
2045 $self->{value}->set_text ($val); 2737 $self->{value}->set_text ($val);
2046} 2738}
2047 2739
2048############################################################################# 2740#############################################################################
2049 2741
2050package CFClient::UI::Slider; 2742package CFPlus::UI::Slider;
2051 2743
2052use strict; 2744use strict;
2053 2745
2054use CFClient::OpenGL; 2746use CFPlus::OpenGL;
2055 2747
2056our @ISA = CFClient::UI::DrawBG::; 2748our @ISA = CFPlus::UI::DrawBG::;
2057 2749
2058my @tex = 2750my @tex =
2059 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2060 qw(s1_slider.png s1_slider_bg.png); 2752 qw(s1_slider.png s1_slider_bg.png);
2061 2753
2062sub new { 2754sub new {
2063 my $class = shift; 2755 my $class = shift;
2064 2756
… …
2070 my $self = $class->SUPER::new ( 2762 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2763 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2764 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2765 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2766 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2767 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2768 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2769 min_h => $::WIDTH / 80,
2078 vertical => 0, 2770 vertical => 0,
2079 can_hover => 1, 2771 can_hover => 1,
2080 inner_pad => 0.02, 2772 inner_pad => 0.02,
2081 @_ 2773 @_
2082 ); 2774 );
… …
2088} 2780}
2089 2781
2090sub set_range { 2782sub set_range {
2091 my ($self, $range) = @_; 2783 my ($self, $range) = @_;
2092 2784
2093 $self->{range} = $range; 2785 ($range, $self->{range}) = ($self->{range}, $range);
2094 2786
2787 if ("@$range" ne "@{$self->{range}}") {
2095 $self->update; 2788 $self->update;
2789 $self->set_value ($self->{range}[0]);
2790 }
2096} 2791}
2097 2792
2098sub set_value { 2793sub set_value {
2099 my ($self, $value) = @_; 2794 my ($self, $value) = @_;
2100 2795
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2796 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2797
2103 $hi = $lo + 1 if $hi <= $lo; 2798 $hi = $lo + 1 if $hi <= $lo;
2104 2799
2800 $page = $hi - $lo if $page > $hi - $lo;
2801
2105 $value = $lo if $value < $lo; 2802 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2803 $value = $hi - $page if $value > $hi - $page;
2107 2804
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2805 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2806 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112 2807
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2808 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2809
2115 if ($value != $old_value) { 2810 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2811 $self->emit (changed => $value);
… …
2119} 2814}
2120 2815
2121sub size_request { 2816sub size_request {
2122 my ($self) = @_; 2817 my ($self) = @_;
2123 2818
2124 my $w = $self->{req_w}; 2819 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2820}
2129 2821
2130sub button_down { 2822sub invoke_button_down {
2131 my ($self, $ev, $x, $y) = @_; 2823 my ($self, $ev, $x, $y) = @_;
2132 2824
2133 $self->SUPER::button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2826
2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2828
2134 $self->mouse_motion ($ev, $x, $y); 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2135}
2136 2830
2831 1
2832}
2833
2137sub mouse_motion { 2834sub invoke_mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2139 2836
2140 if ($GRAB == $self) { 2837 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2838 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2839
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2840 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2841
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2842 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2843
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2844 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2845 } else {
2846 return 0;
2847 }
2848
2148 } 2849 1
2850}
2851
2852sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_;
2854
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860
2861 1
2149} 2862}
2150 2863
2151sub update { 2864sub update {
2152 my ($self) = @_; 2865 my ($self) = @_;
2153 2866
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2867 delete $self->{knob_w};
2868 $self->SUPER::update;
2869}
2870
2871sub _draw {
2872 my ($self) = @_;
2873
2874 unless ($self->{knob_w}) {
2155 $self->set_value ($self->{range}[0]); 2875 $self->set_value ($self->{range}[0]);
2156 2876
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2877 my ($value, $lo, $hi, $page) = @{$self->{range}};
2878 my $range = ($hi - $page - $lo) || 1e-100;
2158 2879
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2880 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2881
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2882 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2883 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2884
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2885 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2886 $value = $value * $self->{scale} + $self->{offset};
2165 2887
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2888 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2889 $self->{knob_w} = $knob_w;
2173 }); 2890 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2891
2181 $self->SUPER::_draw (); 2892 $self->SUPER::_draw ();
2182 2893
2183 glScale $self->{w}, $self->{h}; 2894 glScale $self->{w}, $self->{h};
2184 2895
… …
2204 glDisable GL_TEXTURE_2D; 2915 glDisable GL_TEXTURE_2D;
2205} 2916}
2206 2917
2207############################################################################# 2918#############################################################################
2208 2919
2209package CFClient::UI::ValSlider; 2920package CFPlus::UI::ValSlider;
2210 2921
2211our @ISA = CFClient::UI::HBox::; 2922our @ISA = CFPlus::UI::HBox::;
2212 2923
2213sub new { 2924sub new {
2214 my ($class, %arg) = @_; 2925 my ($class, %arg) = @_;
2215 2926
2216 my $range = delete $arg{range}; 2927 my $range = delete $arg{range};
2217 2928
2218 my $self = $class->SUPER::new ( 2929 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift }, 2932 to_value => sub { shift },
2222 from_value => sub { shift }, 2933 from_value => sub { shift },
2223 %arg, 2934 %arg,
2224 ); 2935 );
2225 2936
… …
2245sub set_range { shift->{slider}->set_range (@_) } 2956sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) } 2957sub set_value { shift->{slider}->set_value (@_) }
2247 2958
2248############################################################################# 2959#############################################################################
2249 2960
2250package CFClient::UI::TextView; 2961package CFPlus::UI::TextScroller;
2251 2962
2252our @ISA = CFClient::UI::HBox::; 2963our @ISA = CFPlus::UI::HBox::;
2253 2964
2254use CFClient::OpenGL; 2965use CFPlus::OpenGL;
2255 2966
2256sub new { 2967sub new {
2257 my $class = shift; 2968 my $class = shift;
2258 2969
2259 my $self = $class->SUPER::new ( 2970 my $self = $class->SUPER::new (
2260 fontsize => 1, 2971 fontsize => 1,
2261 can_events => 0, 2972 can_events => 1,
2973 indent => 0,
2262 #font => default_font 2974 #font => default_font
2263 @_, 2975 @_,
2264 2976
2265 layout => (new CFClient::Layout 1), 2977 layout => (new CFPlus::Layout),
2266 par => [], 2978 par => [],
2979 max_par => 0,
2267 height => 0, 2980 height => 0,
2268 children => [ 2981 children => [
2269 (new CFClient::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2270 (new CFClient::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2271 ], 2984 ],
2272 ); 2985 );
2273 2986
2274 $self->{children}[1]->connect (changed => sub { $self->update }); 2987 $self->{children}[1]->connect (changed => sub { $self->update });
2275 2988
… …
2281 2994
2282 $self->{fontsize} = $fontsize; 2995 $self->{fontsize} = $fontsize;
2283 $self->reflow; 2996 $self->reflow;
2284} 2997}
2285 2998
2999sub size_request {
3000 my ($self) = @_;
3001
3002 my ($empty, $slider) = @{ $self->{children} };
3003
3004 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request
3006}
3007
2286sub size_allocate { 3008sub invoke_size_allocate {
2287 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
2288 3010
2289 $self->SUPER::size_allocate ($w, $h); 3011 my ($empty, $slider, @other) = @{ $self->{children} };
3012 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2290 3013
2291 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3014 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3015 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 3016 $self->{layout}->set_width ($empty->{w});
3017 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2294 3018
2295 $self->reflow; 3019 $self->reflow;
2296}
2297 3020
2298sub text_height { 3021 local $self->{children} = [$empty, $slider];
3022 $self->SUPER::invoke_size_allocate ($w, $h)
3023}
3024
3025sub invoke_mouse_wheel {
2299 my ($self, $text, $indent) = @_; 3026 my ($self, $ev) = @_;
3027
3028 return 0 unless $ev->{dy}; # only vertical movements
3029
3030 $self->{children}[1]->emit (mouse_wheel => $ev);
3031
3032 1
3033}
3034
3035sub get_layout {
3036 my ($self, $para) = @_;
2300 3037
2301 my $layout = $self->{layout}; 3038 my $layout = $self->{layout};
2302 3039
3040 $layout->set_font ($self->{font}) if $self->{font};
3041 $layout->set_foreground (@{$para->{fg}});
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 3043 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2305 $layout->set_markup ($text); 3045 $layout->set_markup ($para->{markup});
3046
3047 $layout->set_shapes (
3048 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}}
2306 3051 );
2307 ($layout->size)[1] 3052
3053 $layout
2308} 3054}
2309 3055
2310sub reflow { 3056sub reflow {
2311 my ($self) = @_; 3057 my ($self) = @_;
2312 3058
2313 $self->{need_reflow}++; 3059 $self->{need_reflow}++;
2314 $self->update; 3060 $self->update;
2315} 3061}
2316 3062
3063sub set_offset {
3064 my ($self, $offset) = @_;
3065
3066 # todo: base offset on lines or so, not on pixels
3067 $self->{children}[1]->set_value ($offset);
3068}
3069
3070sub current_paragraph {
3071 my ($self) = @_;
3072
3073 $self->{top_paragraph} - 1
3074}
3075
3076sub scroll_to {
3077 my ($self, $para) = @_;
3078
3079 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3080
3081 $self->{scroll_to} = $para;
3082 $self->update;
3083}
3084
3085sub clear {
3086 my ($self) = @_;
3087
3088 my (undef, undef, @other) = @{ $self->{children} };
3089 $self->remove ($_) for @other;
3090
3091 $self->{par} = [];
3092 $self->{height} = 0;
3093 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
3094}
3095
2317sub add_paragraph { 3096sub add_paragraph {
2318 my ($self, $color, $text, $indent) = @_; 3097 my $self = shift;
2319 3098
2320 #TODO: intelligently "reformat" paragraph 3099 for my $para (@_) {
3100 $para = {
3101 fg => [1, 1, 1, 1],
3102 indent => 0,
3103 markup => "",
3104 widget => [],
3105 ref $para ? %$para : (markup => $para),
3106 w => 1e10,
3107 wrapped => 1,
3108 };
2321 3109
2322 for my $line (split /\n/, $text) { 3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2323 my $height = $self->text_height ($line); 3111 push @{$self->{par}}, $para;
3112 }
3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
3117
3118 $self->{need_reflow}++;
3119 $self->update;
3120}
3121
3122sub scroll_to_bottom {
3123 my ($self) = @_;
3124
3125 $self->{scroll_to} = $#{$self->{par}};
3126 $self->update;
3127}
3128
3129sub force_uptodate {
3130 my ($self) = @_;
3131
3132 if (delete $self->{need_reflow}) {
3133 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3134
3135 my $height = 0;
3136
3137 for my $para (@{$self->{par}}) {
3138 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3139 my $layout = $self->get_layout ($para);
3140 my ($w, $h) = $layout->size;
3141
3142 $para->{w} = $w + $para->{indent};
3143 $para->{h} = $h;
3144 $para->{wrapped} = $layout->has_wrapped;
3145 }
3146
3147 $para->{y} = $height;
3148 $height += $para->{h};
3149 }
3150
2324 $self->{height} += $height; 3151 $self->{height} = $height;
2325 push @{$self->{par}}, [$height, $color, $indent, $line]; 3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2326 }
2327 3153
2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3154 delete $self->{texture};
2329 $self->{children}[1]->update; 3155 }
3156
3157 if (my $paridx = delete $self->{scroll_to}) {
3158 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3159 }
2330} 3160}
2331 3161
2332sub update { 3162sub update {
2333 my ($self) = @_; 3163 my ($self) = @_;
2334 3164
… …
2336 3166
2337 return unless $self->{h} > 0; 3167 return unless $self->{h} > 0;
2338 3168
2339 delete $self->{texture}; 3169 delete $self->{texture};
2340 3170
2341 $ROOT->on_post_alloc ($self, sub { 3171 $ROOT->on_post_alloc ($self => sub {
2342 if (delete $self->{need_reflow}) { 3172 $self->force_uptodate;
2343 my $height = 0;
2344 3173
2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2346 for @{$self->{par}};
2347 3175
2348 $self->{height} = $height; 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2349
2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2352
2353 delete $self->{texture};
2354 }
2355
2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2357 glClearColor 0.5, 0.5, 0.5, 0; 3177 glClearColor 0, 0, 0, 0;
2358 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2359 3179
3180 package CFPlus::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h});
3183
2360 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2361 3185
3186 my $paridx = 0;
3187 my $top_paragraph;
3188 my $top = int $self->{children}[1]{range}[0];
3189
2362 my $y0 = $top; 3190 my $y0 = $top;
2363 my $y1 = $top + $self->{h}; 3191 my $y1 = $top + $H;
2364 3192
2365 my $y = 0;
2366
2367 my $layout = $self->{layout};
2368
2369 $layout->set_font ($self->{font}) if $self->{font};
2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2374 for my $par (@{$self->{par}}) { 3193 for my $para (@{$self->{par}}) {
2375 my $h = $par->[0]; 3194 my $h = $para->{h};
3195 my $y = $para->{y};
2376 3196
2377 if ($y0 < $y + $h && $y < $y1) { 3197 if ($y0 < $y + $h && $y < $y1) {
2378 $layout->set_foreground (@{ $par->[1] }); 3198 my $layout = $self->get_layout ($para);
2379 $layout->set_width ($self->{w} - $par->[2]);
2380 $layout->set_markup ($par->[3]);
2381 3199
2382 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3200 $layout->render ($para->{indent}, $y - $y0);
2383 3201
2384 glRasterPos $par->[2], $y - $y0; 3202 if (my @w = @{ $para->{widget} }) {
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3203 my @s = $layout->get_shapes;
3204
3205 for (@w) {
3206 my ($dx, $dy) = splice @s, 0, 2, ();
3207
3208 $_->{x} = $dx + $para->{indent};
3209 $_->{y} = $dy + $y - $y0;
3210
3211 $_->draw;
3212 }
3213 }
2386 } 3214 }
2387 3215
2388 $y += $h; 3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2389 } 3218 }
2390 3219
2391 glDisable GL_BLEND; 3220 $self->{top_paragraph} = $top_paragraph;
2392 }; 3221 };
2393 }); 3222 });
2394} 3223}
2395 3224
3225sub reconfigure {
3226 my ($self) = @_;
3227
3228 $self->SUPER::reconfigure;
3229
3230 $_->{w} = 1e10 for @{ $self->{par} };
3231 $self->reflow;
3232}
3233
2396sub _draw { 3234sub _draw {
2397 my ($self) = @_; 3235 my ($self) = @_;
2398 3236
2399 glEnable GL_TEXTURE_2D; 3237 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 1, 1, 1, 1; 3239 glColor 0, 0, 0, 1;
2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3240 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2403 glDisable GL_TEXTURE_2D; 3241 glDisable GL_TEXTURE_2D;
2404 3242
2405 $self->{children}[1]->draw; 3243 $self->{children}[1]->draw;
2406
2407} 3244}
2408 3245
2409############################################################################# 3246#############################################################################
2410 3247
2411package CFClient::UI::Animator; 3248package CFPlus::UI::Animator;
2412 3249
2413use CFClient::OpenGL; 3250use CFPlus::OpenGL;
2414 3251
2415our @ISA = CFClient::UI::Bin::; 3252our @ISA = CFPlus::UI::Bin::;
2416 3253
2417sub moveto { 3254sub moveto {
2418 my ($self, $x, $y) = @_; 3255 my ($self, $x, $y) = @_;
2419 3256
2420 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2448 glPopMatrix; 3285 glPopMatrix;
2449} 3286}
2450 3287
2451############################################################################# 3288#############################################################################
2452 3289
2453package CFClient::UI::Flopper; 3290package CFPlus::UI::Flopper;
2454 3291
2455our @ISA = CFClient::UI::Button::; 3292our @ISA = CFPlus::UI::Button::;
2456 3293
2457sub new { 3294sub new {
2458 my $class = shift; 3295 my $class = shift;
2459 3296
2460 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
2461 state => 0, 3298 state => 0,
2462 connect_activate => \&toggle_flopper, 3299 on_activate => \&toggle_flopper,
2463 @_ 3300 @_
2464 ); 3301 );
2465 3302
2466 if ($self->{state}) {
2467 $self->{state} = 0;
2468 $self->toggle_flopper;
2469 }
2470
2471 $self 3303 $self
2472} 3304}
2473 3305
2474sub toggle_flopper { 3306sub toggle_flopper {
2475 my ($self) = @_; 3307 my ($self) = @_;
2476 3308
2477 # TODO: use animation 3309 $self->{other}->toggle_visibility;
2478 if ($self->{state} = !$self->{state}) {
2479 $CFClient::UI::ROOT->add ($self->{other});
2480 $self->{other}->move ($self->coord2global (0, $self->{h}));
2481 $self->emit ("open");
2482 } else {
2483 $CFClient::UI::ROOT->remove ($self->{other});
2484 $self->emit ("close");
2485 }
2486
2487 $self->emit (changed => $self->{state});
2488} 3310}
2489 3311
2490############################################################################# 3312#############################################################################
2491 3313
2492package CFClient::UI::Tooltip; 3314package CFPlus::UI::Tooltip;
2493 3315
2494our @ISA = CFClient::UI::Bin::; 3316our @ISA = CFPlus::UI::Bin::;
2495 3317
2496use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2497 3319
2498sub new { 3320sub new {
2499 my $class = shift; 3321 my $class = shift;
2500 3322
2501 $class->SUPER::new ( 3323 $class->SUPER::new (
… …
2505} 3327}
2506 3328
2507sub set_tooltip_from { 3329sub set_tooltip_from {
2508 my ($self, $widget) = @_; 3330 my ($self, $widget) = @_;
2509 3331
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 my $tooltip = $widget->{tooltip};
3336
3337 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}";
3342 }
3343
3344 $tooltip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//;
3346
2510 $self->add (new CFClient::UI::Label 3347 $self->add (new CFPlus::UI::Label
2511 markup => $widget->{tooltip}, 3348 markup => $tooltip,
2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2513 fontsize => 0.8, 3350 fontsize => 0.8,
2514 fg => [0, 0, 0, 1], 3351 style => 1, # FLAG_INVERSE
2515 ellipsise => 0, 3352 ellipsise => 0,
2516 font => ($widget->{tooltip_font} || $::FONT_PROP), 3353 font => ($widget->{tooltip_font} || $::FONT_PROP),
2517 ); 3354 );
2518} 3355}
2519 3356
… …
2523 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3360 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2524 3361
2525 ($w + 4, $h + 4) 3362 ($w + 4, $h + 4)
2526} 3363}
2527 3364
2528sub size_allocate { 3365sub invoke_size_allocate {
2529 my ($self, $w, $h) = @_; 3366 my ($self, $w, $h) = @_;
2530 3367
2531 $self->SUPER::size_allocate ($w - 4, $h - 4); 3368 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3369}
3370
3371sub invoke_visibility_change {
3372 my ($self, $visible) = @_;
3373
3374 return unless $visible;
3375
3376 $self->{root}->on_post_alloc ("move_$self" => sub {
3377 my $widget = $self->{owner}
3378 or return;
3379
3380 if ($widget->{visible}) {
3381 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3382
3383 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3384 if $x + $self->{w} > $self->{root}{w};
3385
3386 $self->move_abs ($x, $y);
3387 } else {
3388 $self->hide;
3389 }
3390 });
2532} 3391}
2533 3392
2534sub _draw { 3393sub _draw {
2535 my ($self) = @_; 3394 my ($self) = @_;
2536 3395
… …
2553 glVertex $w, $h; 3412 glVertex $w, $h;
2554 glVertex $w, 0; 3413 glVertex $w, 0;
2555 glEnd; 3414 glEnd;
2556 3415
2557 glTranslate 2 - 0.375, 2 - 0.375; 3416 glTranslate 2 - 0.375, 2 - 0.375;
3417
2558 $self->SUPER::_draw; 3418 $self->SUPER::_draw;
2559} 3419}
2560 3420
2561############################################################################# 3421#############################################################################
2562 3422
2563package CFClient::UI::Face; 3423package CFPlus::UI::Face;
2564 3424
2565our @ISA = CFClient::UI::Base::; 3425our @ISA = CFPlus::UI::DrawBG::;
2566 3426
2567use CFClient::OpenGL; 3427use CFPlus::OpenGL;
2568 3428
2569sub new { 3429sub new {
2570 my $class = shift; 3430 my $class = shift;
2571 3431
2572 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
2573 aspect => 1, 3435 aspect => 1,
3436 can_events => 0,
2574 @_, 3437 @_,
2575 ); 3438 );
2576 3439
2577 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
2579 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2580 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
2581 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2582 hard => 1, 3446 parked => 1,
2583 interval => $self->{animspeed},
2584 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
2585 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
2586 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
2587 }, 3455 },
2588 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
2589 } 3460 }
2590 3461
2591 $self 3462 $self
2592} 3463}
2593 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
2594sub size_request { 3496sub size_request {
2595 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
2596} 3513}
2597 3514
2598sub update { 3515sub update {
2599 my ($self) = @_; 3516 my ($self) = @_;
2600 3517
2601 return unless $self->{visible}; 3518 return unless $self->{visible};
2602 3519
2603 $self->SUPER::update; 3520 $self->SUPER::update;
2604} 3521}
2605 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
2606sub _draw { 3531sub _draw {
2607 my ($self) = @_; 3532 my ($self) = @_;
2608 3533
2609 return unless $::CONN;#d# manage and cache textures differently 3534 $self->SUPER::_draw;
2610 3535
2611 my $face; 3536 if (my $tex = $self->{tex}) {
2612
2613 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}];
2615
2616 $face = $anim->[ $self->{frame} % @$anim ]
2617 if $anim && @$anim;
2618 }
2619
2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2621
2622 if ($tex) {
2623 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 3539 glColor 0, 0, 0, 1;
2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2627 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
2628 } 3542 }
2629} 3543}
2630 3544
2631sub DESTROY { 3545sub destroy {
2632 my ($self) = @_; 3546 my ($self) = @_;
2633 3547
2634 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
2635 if $self->{timer}; 3549 if $self->{timer};
2636 3550
2637 $self->SUPER::DESTROY; 3551 $self->SUPER::destroy;
2638} 3552}
2639 3553
2640############################################################################# 3554#############################################################################
2641 3555
2642package CFClient::UI::InventoryItem; 3556package CFPlus::UI::Buttonbar;
2643 3557
2644our @ISA = CFClient::UI::HBox::; 3558our @ISA = CFPlus::UI::HBox::;
2645 3559
2646sub _item_to_desc { 3560# TODO: should actually wrap buttons and other goodies.
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2671
2672sub new {
2673 my $class = shift;
2674
2675 my %args = @_;
2676
2677 my $item = delete $args{item};
2678
2679 my $desc = _item_to_desc ($item);
2680
2681 my $self = $class->SUPER::new (
2682 can_hover => 1,
2683 can_events => 1,
2684 tooltip => ((CFClient::UI::Label::escape $desc)
2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2686 connect_button_down => sub {
2687 my ($self, $ev, $x, $y) = @_;
2688
2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2698 } elsif ($ev->{button} == 1) {
2699 $::CONN->send ("examine $item->{tag}");
2700 } elsif ($ev->{button} == 2) {
2701 $::CONN->send ("apply $item->{tag}");
2702 } elsif ($ev->{button} == 3) {
2703 my @menu_items = (
2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2716 ),
2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2720 }
2721
2722 1
2723 },
2724 %args
2725 );
2726
2727
2728 $self->add (new CFClient::UI::Face
2729 can_events => 0,
2730 face => $item->{face},
2731 anim => $item->{anim},
2732 animspeed => $item->{animspeed},
2733 );
2734
2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2736
2737 $self->{item} = $item;
2738
2739 $self->update_item;
2740
2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2750}
2751 3561
2752############################################################################# 3562#############################################################################
2753 3563
2754package CFClient::UI::Inventory;
2755
2756our @ISA = CFClient::UI::ScrolledWindow::;
2757
2758sub new {
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 for my $item (@items) {
2783 $item->{item} = $item;
2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@items) {
2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2793 }
2794
2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2796}
2797
2798sub size_request {
2799 my ($self) = @_;
2800 ($self->{req_w}, $self->{req_h});
2801}
2802
2803#############################################################################
2804
2805package CFClient::UI::Menu; 3564package CFPlus::UI::Menu;
2806 3565
2807our @ISA = CFClient::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
2808 3567
2809use CFClient::OpenGL; 3568use CFPlus::OpenGL;
2810 3569
2811sub new { 3570sub new {
2812 my $class = shift; 3571 my $class = shift;
2813 3572
2814 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
2815 items => [], 3574 items => [],
2816 z => 100, 3575 z => 100,
2817 @_, 3576 @_,
2818 ); 3577 );
2819 3578
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2821 3580
2822 for my $item (@{ $self->{items} }) { 3581 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 3582 my ($widget, $cb, $tooltip) = @$item;
2824 3583
2825 # handle various types of items, only text for now 3584 # handle various types of items, only text for now
2826 if (!ref $widget) { 3585 if (!ref $widget) {
3586 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2;
3588
2827 $widget = new CFClient::UI::Label 3589 $widget = new CFPlus::UI::HBox
2828 can_hover => 1, 3590 can_hover => 1,
2829 can_events => 1, 3591 can_events => 1,
3592 tooltip => $tooltip,
3593 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ],
3597 ;
3598
3599 } else {
3600 $widget = new CFPlus::UI::Label
3601 can_hover => 1,
3602 can_events => 1,
2830 text => $widget; 3603 markup => $widget,
3604 tooltip => $tooltip;
3605 }
2831 } 3606 }
2832 3607
2833 $self->{item}{$widget} = $item; 3608 $self->{item}{$widget} = $item;
2834 3609
2835 $self->{vbox}->add ($widget); 3610 $self->{vbox}->add ($widget);
… …
2847 # maybe save $GRAB? must be careful about events... 3622 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 3623 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 3624 $self->{button} = $ev->{button};
2850 3625
2851 $self->show; 3626 $self->show;
2852 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3627 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853} 3628}
2854 3629
2855sub mouse_motion { 3630sub invoke_mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 3631 my ($self, $ev, $x, $y) = @_;
2857 3632
2858 # TODO: should use vbox->find_widget or so 3633 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3634 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 3635 $self->{hover} = $self->{item}{$HOVER};
2861}
2862 3636
3637 0
3638}
3639
2863sub button_up { 3640sub invoke_button_up {
2864 my ($self, $ev, $x, $y) = @_; 3641 my ($self, $ev, $x, $y) = @_;
2865 3642
2866 if ($ev->{button} == $self->{button}) { 3643 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 3644 undef $GRAB;
2868 $self->hide; 3645 $self->hide;
2869 3646
2870 $self->emit ("popdown"); 3647 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 3648 $self->{hover}[1]->() if $self->{hover};
3649 } else {
3650 return 0
3651 }
3652
2872 } 3653 1
2873} 3654}
2874 3655
2875############################################################################# 3656#############################################################################
2876 3657
2877package CFClient::UI::Statusbox; 3658package CFPlus::UI::Multiplexer;
2878 3659
2879our @ISA = CFClient::UI::VBox::; 3660our @ISA = CFPlus::UI::Container::;
2880 3661
2881sub new { 3662sub new {
2882 my $class = shift; 3663 my $class = shift;
2883 3664
2884 $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
3666 @_,
3667 );
3668
3669 $self->{current} = $self->{children}[0]
3670 if @{ $self->{children} };
3671
3672 $self
3673}
3674
3675sub add {
3676 my ($self, @widgets) = @_;
3677
3678 $self->SUPER::add (@widgets);
3679
3680 $self->{current} = $self->{children}[0]
3681 if @{ $self->{children} };
3682}
3683
3684sub get_current_page {
3685 my ($self) = @_;
3686
3687 $self->{current}
3688}
3689
3690sub set_current_page {
3691 my ($self, $page_or_widget) = @_;
3692
3693 my $widget = ref $page_or_widget
3694 ? $page_or_widget
3695 : $self->{children}[$page_or_widget];
3696
3697 $self->{current} = $widget;
3698 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3699
3700 $self->emit (page_changed => $self->{current});
3701
3702 $self->realloc;
3703}
3704
3705sub visible_children {
3706 $_[0]{current}
3707}
3708
3709sub size_request {
3710 my ($self) = @_;
3711
3712 $self->{current}->size_request
3713}
3714
3715sub invoke_size_allocate {
3716 my ($self, $w, $h) = @_;
3717
3718 $self->{current}->configure (0, 0, $w, $h);
3719
3720 1
3721}
3722
3723sub _draw {
3724 my ($self) = @_;
3725
3726 $self->{current}->draw;
3727}
3728
3729#############################################################################
3730
3731package CFPlus::UI::Notebook;
3732
3733our @ISA = CFPlus::UI::VBox::;
3734
3735sub new {
3736 my $class = shift;
3737
3738 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3741 # filter => # will be put between multiplexer and $self
3742 @_,
3743 );
3744
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747
3748 $self
3749}
3750
3751sub add {
3752 my ($self, $title, $widget, $tooltip) = @_;
3753
3754 CFPlus::weaken $self;
3755
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget);
3767}
3768
3769sub get_current_page {
3770 my ($self) = @_;
3771
3772 $self->{multiplexer}->get_current_page
3773}
3774
3775sub set_current_page {
3776 my ($self, $page) = @_;
3777
3778 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current});
3780}
3781
3782#############################################################################
3783
3784package CFPlus::UI::Selector;
3785
3786use utf8;
3787
3788our @ISA = CFPlus::UI::Button::;
3789
3790sub new {
3791 my $class = shift;
3792
3793 my $self = $class->SUPER::new (
3794 options => [], # [value, title, longdesc], ...
3795 value => undef,
3796 @_,
3797 );
3798
3799 $self->_set_value ($self->{value});
3800
3801 $self
3802}
3803
3804sub invoke_button_down {
3805 my ($self, $ev) = @_;
3806
3807 my @menu_items;
3808
3809 for (@{ $self->{options} }) {
3810 my ($value, $title, $tooltip) = @$_;
3811
3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3813 }
3814
3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3816}
3817
3818sub _set_value {
3819 my ($self, $value) = @_;
3820
3821 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3822 or return;
3823
3824 $self->{value} = $item->[0];
3825 $self->set_markup ("$item->[1] ⇓");
3826 $self->set_tooltip ($item->[2]);
3827}
3828
3829sub set_value {
3830 my ($self, $value) = @_;
3831
3832 return unless $self->{value} ne $value;
3833
3834 $self->_set_value ($value);
3835 $self->emit (changed => $value);
3836}
3837
3838#############################################################################
3839
3840package CFPlus::UI::Statusbox;
3841
3842our @ISA = CFPlus::UI::VBox::;
3843
3844sub new {
3845 my $class = shift;
3846
3847 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3848 fontsize => 0.8,
2886 @_, 3849 @_,
2887 ) 3850 );
3851
3852 CFPlus::weaken (my $this = $self);
3853
3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3855
3856 $self
2888} 3857}
2889 3858
2890sub reorder { 3859sub reorder {
2891 my ($self) = @_; 3860 my ($self) = @_;
2892 my $NOW = time; 3861 my $NOW = Time::HiRes::time;
3862
3863 # freeze display when hovering over any label
3864 return if $CFPlus::UI::TOOLTIP->{owner}
3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3866 values %{ $self->{item} };
2893 3867
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3868 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3869 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3870 }
2897 3871
… …
2900 my @items = sort { 3874 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3875 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3876 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3877 } values %{ $self->{item} };
2904 3878
3879 $self->{timer}->interval (1);
3880
2905 my $count = 10 + 1; 3881 my $count = 10 + 1;
2906 for my $item (@items) { 3882 for my $item (@items) {
2907 last unless --$count; 3883 last unless --$count;
2908 3884
2909 push @widgets, $item->{label} ||= do { 3885 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3886 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3887 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3888 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3889 : $item->{text};
2914 3890
2915 for ($short) { 3891 for ($short) {
2916 s/^\s+//; 3892 s/^\s+//;
2917 s/\s+/ /g; 3893 s/\s+/ /g;
2918 } 3894 }
2919 3895
2920 new CFClient::UI::Label 3896 new CFPlus::UI::Label
2921 markup => $short, 3897 markup => $short,
2922 tooltip => $item->{tooltip}, 3898 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3899 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3900 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3901 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3902 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3903 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3904 can_events => 1,
2929 can_hover => 1 3905 can_hover => 1
2930 }; 3906 };
3907
3908 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3909 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3910 $label->update;
3911 $label->set_max_size (undef, $label->{req_h} * $diff)
3912 if $diff < 1;
3913 $self->{timer}->interval (1/30);
3914 } else {
3915 $label->{fg}[3] = $item->{fg}[3] || 1;
3916 }
3917
3918 push @widgets, $label;
2931 } 3919 }
2932 3920
2933 $self->clear; 3921 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3922 $self->SUPER::add (reverse @widgets);
2935} 3923}
… …
2938 my ($self, $text, %arg) = @_; 3926 my ($self, $text, %arg) = @_;
2939 3927
2940 $text =~ s/^\s+//; 3928 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3929 $text =~ s/\s+$//;
2942 3930
3931 return unless $text;
3932
2943 my $timeout = time + ((delete $arg{timeout}) || 60); 3933 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2944 3934
2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3935 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2946 3936
2947 if (my $item = $self->{item}{$group}) { 3937 if (my $item = $self->{item}{$group}) {
2948 if ($item->{text} eq $text) { 3938 if ($item->{text} eq $text) {
2949 $item->{count}++; 3939 $item->{count}++;
2950 } else { 3940 } else {
2951 $item->{count} = 1; 3941 $item->{count} = 1;
2952 $item->{text} = $item->{tooltip} = $text; 3942 $item->{text} = $item->{tooltip} = $text;
2953 } 3943 }
2954 $item->{id} = ++$self->{id}; 3944 $item->{id} += 0.2;#d#
2955 $item->{timeout} = $timeout; 3945 $item->{timeout} = $timeout;
2956 delete $item->{label}; 3946 delete $item->{label};
2957 } else { 3947 } else {
2958 $self->{item}{$group} = { 3948 $self->{item}{$group} = {
2959 id => ++$self->{id}, 3949 id => ++$self->{id},
… …
2965 count => 1, 3955 count => 1,
2966 %arg, 3956 %arg,
2967 }; 3957 };
2968 } 3958 }
2969 3959
3960 $ROOT->on_refresh (reorder => sub {
2970 $self->reorder; 3961 $self->reorder;
3962 });
2971} 3963}
2972 3964
2973sub reconfigure { 3965sub reconfigure {
2974 my ($self) = @_; 3966 my ($self) = @_;
2975 3967
… …
2978 3970
2979 $self->reorder; 3971 $self->reorder;
2980 $self->SUPER::reconfigure; 3972 $self->SUPER::reconfigure;
2981} 3973}
2982 3974
3975sub destroy {
3976 my ($self) = @_;
3977
3978 $self->{timer}->cancel;
3979
3980 $self->SUPER::destroy;
3981}
3982
2983############################################################################# 3983#############################################################################
2984 3984
2985package CFClient::UI::Root; 3985package CFPlus::UI::Root;
2986 3986
2987our @ISA = CFClient::UI::Container::; 3987our @ISA = CFPlus::UI::Container::;
2988 3988
3989use List::Util qw(min max);
3990
2989use CFClient::OpenGL; 3991use CFPlus::OpenGL;
2990 3992
2991sub new { 3993sub new {
2992 my $class = shift; 3994 my $class = shift;
2993 3995
2994 $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3997 visible => 1,
2995 @_, 3998 @_,
2996 ) 3999 );
2997}
2998 4000
2999sub configure { 4001 CFPlus::weaken ($self->{root} = $self);
3000 my ($self, $x, $y, $w, $h) = @_;
3001 4002
3002 $self->{w} = $w; 4003 $self
3003 $self->{h} = $h;
3004}
3005
3006sub check_size {
3007 my ($self) = @_;
3008
3009 $self->size_allocate ($self->{w}, $self->{h})
3010 if $self->{w};
3011} 4004}
3012 4005
3013sub size_request { 4006sub size_request {
3014 my ($self) = @_; 4007 my ($self) = @_;
3015 4008
3016 ($self->{w}, $self->{h}) 4009 ($self->{w}, $self->{h})
3017} 4010}
3018 4011
4012sub _to_pixel {
4013 my ($coord, $size, $max) = @_;
4014
4015 $coord =
4016 $coord eq "center" ? ($max - $size) * 0.5
4017 : $coord eq "max" ? $max
4018 : $coord;
4019
4020 $coord = 0 if $coord < 0;
4021 $coord = $max - $size if $coord > $max - $size;
4022
4023 int $coord + 0.5
4024}
4025
3019sub size_allocate { 4026sub invoke_size_allocate {
3020 my ($self, $w, $h) = @_; 4027 my ($self, $w, $h) = @_;
3021
3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3024
3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3027 4028
3028 for my $child ($self->children) { 4029 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4030 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 4031
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4032 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 4033 $Y = $child->{force_y} if exists $child->{force_y};
3033 4034
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4035 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 4036 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 4037
3040 $child->configure ($X, $Y, $W, $H); 4038 $child->configure ($X, $Y, $W, $H);
3041 } 4039 }
4040
4041 1
3042} 4042}
3043 4043
3044sub coord2local { 4044sub coord2local {
3045 my ($self, $x, $y) = @_; 4045 my ($self, $x, $y) = @_;
3046 4046
… …
3054} 4054}
3055 4055
3056sub update { 4056sub update {
3057 my ($self) = @_; 4057 my ($self) = @_;
3058 4058
3059 $self->check_size;
3060 $::WANT_REFRESH++; 4059 $::WANT_REFRESH++;
3061} 4060}
3062 4061
3063sub add { 4062sub add {
3064 my ($self, @children) = @_; 4063 my ($self, @children) = @_;
3065 4064
3066 for my $child (@children) {
3067 $child->{toplevel} = 1; 4065 $_->{is_toplevel} = 1
3068 4066 for @children;
3069 # integerise window positions
3070 $child->{x} = int $child->{x};
3071 $child->{y} = int $child->{y};
3072 }
3073 4067
3074 $self->SUPER::add (@children); 4068 $self->SUPER::add (@children);
4069}
4070
4071sub remove {
4072 my ($self, @children) = @_;
4073
4074 $self->SUPER::remove (@children);
4075
4076 delete $self->{is_toplevel}
4077 for @children;
3075 4078
3076 while (@children) { 4079 while (@children) {
3077 my $w = pop @children; 4080 my $w = pop @children;
3078 push @children, $w->children; 4081 push @children, $w->children;
3079 $w->{visible} = 1; 4082 $w->set_invisible;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 } 4083 }
3093} 4084}
3094 4085
3095sub on_refresh { 4086sub on_refresh {
3096 my ($self, $id, $cb) = @_; 4087 my ($self, $id, $cb) = @_;
… …
3110 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3111 $_->() 4102 $_->()
3112 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3113 } 4104 }
3114 4105
3115 if ($self->{check_size}) { 4106 while ($self->{realloc}) {
3116 my @queue = ([], []); 4107 my %queue;
4108 my @queue;
4109 my $widget;
3117 4110
3118 for (;;) { 4111 outer:
3119 if ($self->{check_size}) { 4112 while () {
3120 # heuristic: check containers last 4113 if (my $realloc = delete $self->{realloc}) {
3121 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4114 for $widget (values %$realloc) {
3122 for values %{delete $self->{check_size}} 4115 $widget->{visible} or next; # do not resize invisible widgets
4116
4117 $queue{$widget+0}++ and next; # duplicates are common
4118
4119 push @{ $queue[$widget->{visible}] }, $widget;
4120 }
3123 } 4121 }
3124 4122
3125 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4123 while () {
4124 @queue or last outer;
3126 4125
3127 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4126 $widget = pop @{ $queue[-1] || [] }
3128 ? @$widget{qw(user_w user_h)} 4127 and last;
3129 : $widget->size_request;
3130
3131 if (delete $widget->{force_alloc}
3132 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3133 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3134 4128
4129 pop @queue;
4130 }
4131
4132 delete $queue{$widget+0};
4133
4134 my ($w, $h) = $widget->size_request;
4135
4136 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4137 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4138
4139 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4140 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4141
4142 $w = $widget->{force_w} if exists $widget->{force_w};
4143 $h = $widget->{force_h} if exists $widget->{force_h};
4144
4145 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4146 || delete $widget->{force_realloc}) {
3135 $widget->{req_w} = $w; 4147 $widget->{req_w} = $w;
3136 $widget->{req_h} = $h; 4148 $widget->{req_h} = $h;
3137 4149
3138 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4150 $self->{size_alloc}{$widget+0} = $widget;
3139 4151
3140 $widget->{parent}->check_size
3141 if $widget->{parent}; 4152 if (my $parent = $widget->{parent}) {
4153 $self->{realloc}{$parent+0} = $parent
4154 unless $queue{$parent+0};
4155
4156 $parent->{force_size_alloc} = 1;
4157 $self->{size_alloc}{$parent+0} = $parent;
4158 }
3142 } 4159 }
4160
4161 delete $self->{realloc}{$widget+0};
3143 } 4162 }
3144 }
3145 4163
3146 while ($self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3147 for (values %{delete $self->{size_alloc}}) { 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3148 my ($widget, $w, $h) = @$_; 4166 values %$size_alloc;
3149 4167
4168 while () {
4169 my $widget = pop @queue || last;
4170
4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4172
4173 $w = max $widget->{min_w}, $w;
4174 $h = max $widget->{min_h}, $h;
4175
4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4178
4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4181
3150 $w = 0 if $w < 0; 4182 $w = int $w + 0.5;
3151 $h = 0 if $h < 0; 4183 $h = int $h + 0.5;
3152 4184
4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4186 $widget->{old_w} = $widget->{w};
4187 $widget->{old_h} = $widget->{h};
4188
3153 $widget->{w} = $w; 4189 $widget->{w} = $w;
3154 $widget->{h} = $h; 4190 $widget->{h} = $h;
3155 $widget->size_allocate ($w, $h); 4191
3156 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
4194 }
3157 } 4195 }
3158 } 4196 }
3159 4197
3160 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
3161 $_->() 4199 $_->()
… …
3170 glLoadIdentity; 4208 glLoadIdentity;
3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3172 glMatrixMode GL_MODELVIEW; 4210 glMatrixMode GL_MODELVIEW;
3173 glLoadIdentity; 4211 glLoadIdentity;
3174 4212
4213 {
4214 package CFPlus::UI::Base;
4215
4216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4217 (0, 0, $self->{w}, $self->{h});
4218
3175 $self->_draw; 4219 $self->_draw;
4220 }
3176} 4221}
3177 4222
3178############################################################################# 4223#############################################################################
3179 4224
3180package CFClient::UI; 4225package CFPlus::UI;
3181 4226
3182$ROOT = new CFClient::UI::Root; 4227$ROOT = new CFPlus::UI::Root;
3183$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3184 4229
31851 42301
3186 4231

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines