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

Diff Legend

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