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

Diff Legend

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