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

Diff Legend

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