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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 2007 UTC

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

Diff Legend

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