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

Diff Legend

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