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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.237 by root, Thu May 25 21:36:45 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
18
19sub check_tooltip {
20 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) {
25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 }
43
44 return;
45 }
46 }
47 }
48
49 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner};
51}
14 52
15# class methods for events 53# class methods for events
16sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS;
18} 57}
19 58
20sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS;
22} 62}
23 63
24sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
25 my ($ev) = @_; 65 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 68 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 69 my $widget = $ROOT->find_widget ($x, $y);
30 70
31 $GRAB = $widget; 71 $GRAB = $widget;
32 $GRAB->update if $GRAB; 72 $GRAB->update if $GRAB;
73
74 check_tooltip;
33 } 75 }
34 76
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 78
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 if $GRAB;
38} 81}
39 82
40sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
41 my ($ev) = @_; 84 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
43 86
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 88
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 90
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 if $GRAB;
49 93
50 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 96 $grab->update if $grab;
53 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
98
99 check_tooltip;
54 } 100 }
55} 101}
56 102
57sub feed_sdl_motion_event { 103sub feed_sdl_motion_event {
58 my ($ev) = @_; 104 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 109 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 110 my $hover = $HOVER; $HOVER = $widget;
65 111
66 $hover->update if $hover && $hover->{can_hover}; 112 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 114
115 check_tooltip;
116 }
117
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER;
71} 120}
72 121
73# convert position array to integers 122# convert position array to integers
74sub harmonize { 123sub harmonize {
75 my ($vals) = @_; 124 my ($vals) = @_;
… …
81 $rem += $_ - $i; 130 $rem += $_ - $i;
82 $_ = $i; 131 $_ = $i;
83 } 132 }
84} 133}
85 134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
169}
170
86############################################################################# 171#############################################################################
87 172
88package CFClient::UI::Base; 173package CFClient::UI::Base;
89 174
90use strict; 175use strict;
… …
93 178
94sub new { 179sub new {
95 my $class = shift; 180 my $class = shift;
96 181
97 my $self = bless { 182 my $self = bless {
98 x => 0, 183 x => 0,
99 y => 0, 184 y => 0,
100 z => 0, 185 z => 0,
186 can_events => 1,
101 @_ 187 @_
102 }, $class; 188 }, $class;
103 189
104 for (keys %$self) { 190 for (keys %$self) {
105 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
107 } 193 }
108 } 194 }
109 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
110 $self 198 $self
111} 199}
112 200
201sub destroy {
202 my ($self) = @_;
203
204 $self->hide;
205 %$self = ();
206}
207
113sub show { 208sub show {
114 my ($self) = @_; 209 my ($self) = @_;
115
116 return if $self->{parent}; 210 return if $self->{parent};
117 211
118 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
119} 213}
120 214
215sub show_centered {
216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
234
235 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
121sub hide { 244sub hide {
122 my ($self) = @_; 245 my ($self) = @_;
123 246
124 return unless $self->{parent}; 247 $self->set_invisible;
125 248
126 $self->{parent}->remove ($self); 249 $self->{parent}->remove ($self)
250 if $self->{parent};
127} 251}
128 252
129sub move { 253sub move {
130 my ($self, $x, $y, $z) = @_; 254 my ($self, $x, $y, $z) = @_;
131 255
… …
134 $self->{z} = $z if defined $z; 258 $self->{z} = $z if defined $z;
135 259
136 $self->update; 260 $self->update;
137} 261}
138 262
139sub needs_redraw { 263sub set_size {
140 0 264 my ($self, $w, $h) = @_;
265
266 $self->{user_w} = $w;
267 $self->{user_h} = $h;
268
269 $self->check_size;
141} 270}
142 271
143sub size_request { 272sub size_request {
144 require Carp; 273 require Carp;
145 Carp::confess "size_request is abstract"; 274 Carp::confess "size_request is abstract";
… …
165 $self->{y} = $y; 294 $self->{y} = $y;
166 $self->update; 295 $self->update;
167 } 296 }
168 297
169 if ($self->{w} != $w || $self->{h} != $h) { 298 if ($self->{w} != $w || $self->{h} != $h) {
170 $self->{w} = $w; 299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
171 $self->{h} = $h;
172
173 $self->size_allocate ($w, $h);
174 $self->update;
175 } 300 }
176} 301}
177 302
178sub size_allocate { 303sub size_allocate {
179 # nothing to be done 304 # nothing to be done
180} 305}
181 306
182# return top left coordinates 307sub reconfigure {
183sub _topleft { 308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children {
315}
316
317sub set_max_size {
184 my ($self, $x, $y) = @_; 318 my ($self, $w, $h) = @_;
185 319
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h;
322}
323
324sub set_tooltip {
325 my ($self, $tooltip) = @_;
326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
332 $self->{tooltip} = $tooltip;
333
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip;
337 }
187} 338}
188 339
189# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
190sub coord2local { 341sub coord2local {
191 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
192 343
193 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 345}
196 346
197# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
198sub coord2global { 348sub coord2global {
199 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
200 350
201 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 352}
204 353
205sub focus_in { 354sub focus_in {
206 my ($self) = @_; 355 my ($self) = @_;
207 356
208 return if $FOCUS == $self; 357 return if $FOCUS == $self;
209 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
210 359
211 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
212 361
213 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
214 363
215 $focus->update if $focus; 364 $focus->update if $focus;
216 $FOCUS->update; 365 $FOCUS->update;
217} 366}
218 367
… …
221 370
222 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
223 372
224 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
225 374
226 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
227 376
228 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
229} 381}
230 382
231sub mouse_motion { } 383sub mouse_motion { }
232sub button_up { } 384sub button_up { }
233sub key_down { } 385sub key_down { }
234sub key_up { } 386sub key_up { }
235 387
236sub button_down { 388sub button_down {
237 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
238 390
239 $self->focus_in; 391 $self->focus_in;
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 419 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 420 glVertex $x , $y + $self->{h};
269 glEnd; 421 glEnd;
270 glDisable GL_BLEND; 422 glDisable GL_BLEND;
271 } 423 }
424
425 if ($ENV{PCLIENT_DEBUG}) {
426 glPushMatrix;
427 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1;
434 glEnd;
435 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 }
272} 438}
273 439
274sub _draw { 440sub _draw {
275 my ($self) = @_; 441 my ($self) = @_;
276 442
277 warn "no draw defined for $self\n"; 443 warn "no draw defined for $self\n";
278} 444}
279 445
280sub find_widget { 446sub find_widget {
281 my ($self, $x, $y) = @_; 447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
282 450
283 return $self 451 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 454
… …
289 457
290sub set_parent { 458sub set_parent {
291 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
292 460
293 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
294} 471}
295 472
296sub check_size { 473sub check_size {
297 my ($self) = @_; 474 my ($self, $forced) = @_;
298 475
299 my ($w, $h) = $self->size_request; 476 $self->{force_alloc} = 1 if $forced;
300 477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308} 478}
309 479
310sub update { 480sub update {
311 my ($self) = @_; 481 my ($self) = @_;
312 482
… …
318 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
319 489
320 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
321} 491}
322 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
323sub emit { 499sub emit {
324 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
325 501
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 502 $self->_emit ($signal, @args)
327 $cb->($self, @args); 503 || $self->$signal (@args);
328 }
329} 504}
330 505
331sub DESTROY { 506sub DESTROY {
332 my ($self) = @_; 507 my ($self) = @_;
333 508
509 delete $WIDGET{$self+0};
334 #$self->deactivate; 510 #$self->deactivate;
335} 511}
336 512
337############################################################################# 513#############################################################################
338 514
… …
347 my $class = shift; 523 my $class = shift;
348 524
349 # range [value, low, high, page] 525 # range [value, low, high, page]
350 526
351 $class->SUPER::new ( 527 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2], 528 #bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5], 529 #active_bg => [1, 1, 1, 0.5],
354 @_ 530 @_
355 ) 531 )
356} 532}
357 533
358sub _draw { 534sub _draw {
359 my ($self) = @_; 535 my ($self) = @_;
360 536
537 my $color = $FOCUS == $self && $self->{active_bg}
538 ? $self->{active_bg}
539 : $self->{bg};
540
541 if ($color && (@$color < 4 || $color->[3])) {
361 my ($w, $h) = @$self{qw(w h)}; 542 my ($w, $h) = @$self{qw(w h)};
362 543
363 glEnable GL_BLEND; 544 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 546 glColor @$color;
366 547
367 glBegin GL_QUADS; 548 glBegin GL_QUADS;
368 glVertex 0 , 0; 549 glVertex 0 , 0;
369 glVertex 0 , $h; 550 glVertex 0 , $h;
370 glVertex $w, $h; 551 glVertex $w, $h;
371 glVertex $w, 0; 552 glVertex $w, 0;
372 glEnd; 553 glEnd;
373 554
374 glDisable GL_BLEND; 555 glDisable GL_BLEND;
556 }
375} 557}
376 558
377############################################################################# 559#############################################################################
378 560
379package CFClient::UI::Empty; 561package CFClient::UI::Empty;
380 562
381our @ISA = CFClient::UI::Base::; 563our @ISA = CFClient::UI::Base::;
564
565sub new {
566 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg);
568}
382 569
383sub size_request { 570sub size_request {
384 (0, 0) 571 (0, 0)
385} 572}
386 573
… …
395sub new { 582sub new {
396 my ($class, %arg) = @_; 583 my ($class, %arg) = @_;
397 584
398 my $children = delete $arg{children} || []; 585 my $children = delete $arg{children} || [];
399 586
400 my $self = $class->SUPER::new (children => [], %arg); 587 my $self = $class->SUPER::new (
588 children => [],
589 can_events => 0,
590 %arg,
591 );
401 $self->add ($_) for @$children; 592 $self->add ($_) for @$children;
402 593
403 $self 594 $self
404} 595}
405 596
406sub add { 597sub add {
407 my ($self, $child) = @_; 598 my ($self, @widgets) = @_;
408 599
409 $child->set_parent ($self); 600 $_->set_parent ($self)
601 for @widgets;
410 602
411 use sort 'stable'; 603 use sort 'stable';
412 604
413 $self->{children} = [ 605 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 606 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 607 @{$self->{children}}, @widgets
416 ]; 608 ];
417 609
418 $child->check_size; 610 $self->check_size (1);
611 $self->update;
612}
613
614sub children {
615 @{ $_[0]{children} }
419} 616}
420 617
421sub remove { 618sub remove {
422 my ($self, $child) = @_; 619 my ($self, $child) = @_;
423 620
424 delete $child->{parent}; 621 delete $child->{parent};
622 $child->hide;
425 623
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 625
626 $self->check_size (1);
627 $self->update;
628}
629
630sub clear {
631 my ($self) = @_;
632
633 my $children = delete $self->{children};
634 $self->{children} = [];
635
636 for (@$children) {
637 delete $_->{parent};
638 $_->hide;
639 }
640
428 $self->check_size; 641 $self->check_size;
642 $self->update;
429} 643}
430 644
431sub find_widget { 645sub find_widget {
432 my ($self, $x, $y) = @_; 646 my ($self, $x, $y) = @_;
433 647
… …
508} 722}
509 723
510sub update { 724sub update {
511 my ($self) = @_; 725 my ($self) = @_;
512 726
513 # we want to do this delayed... 727 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 728 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 729}
527 730
528sub size_allocate { 731sub size_allocate {
529 my ($self, $w, $h) = @_; 732 my ($self, $w, $h) = @_;
530 733
531 $self->child->configure (0, 0, $w, $h); 734 $self->SUPER::size_allocate ($w, $h);
735 $self->update;
736}
532 737
738sub _render {
739 $_[0]{children}[0]->draw;
740}
741
742sub render_child {
743 my ($self) = @_;
744
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT;
748
533 $self->render_chld; 749 $self->_render;
750 };
534} 751}
535 752
536sub _draw { 753sub _draw {
537 my ($self) = @_; 754 my ($self) = @_;
538 755
539 my ($w, $h) = ($self->w, $self->h); 756 my ($w, $h) = ($self->w, $self->h);
540 757
541 my $tex = $self->{texture} 758 my $tex = $self->{texture}
542 or return; 759 or return;
543 760
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1;
548 764
549 $tex->draw_quad (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 766
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
553} 768}
554 769
555############################################################################# 770#############################################################################
556 771
557package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
558 773
559our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586 775
587sub new { 776sub new {
588 my $class = shift; 777 my $class = shift;
589 778
590 my $self = $class->SUPER::new ( 779 $class->SUPER::new (
591 bg => [1, 1, 1, 1], 780 scroll_x => 0,
592 border_bg => [1, 1, 1, 1], 781 scroll_y => 1,
593 border => 0.8,
594 @_ 782 @_,
595 ); 783 )
596
597 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605} 784}
606 785
607sub size_request { 786sub size_request {
608 my ($self) = @_; 787 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h}) 788
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
790
791 @$self{qw(child_w child_h)}
610} 792}
611 793
612sub size_allocate { 794sub size_allocate {
613 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
614 $self->{w} = $w; 796
615 $self->{h} = $h; 797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
616 $self->child->configure (0, 0, $w, $h); 800 $self->child->configure (0, 0, $w, $h);
801 $self->update;
802}
803
804sub set_offset {
805 my ($self, $x, $y) = @_;
806
807 $self->{view_x} = int $x;
808 $self->{view_y} = int $y;
809
810 $self->update;
811}
812
813# hmm, this does not work for topleft of $self... but we should not ask for that
814sub coord2local {
815 my ($self, $x, $y) = @_;
816
817 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
818}
819
820sub coord2global {
821 my ($self, $x, $y) = @_;
822
823 $x = List::Util::min $self->{w}, $x - $self->{view_x};
824 $y = List::Util::min $self->{h}, $y - $self->{view_y};
825
826 $self->SUPER::coord2global ($x, $y)
827}
828
829sub find_widget {
830 my ($self, $x, $y) = @_;
831
832 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
833 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
834 ) {
835 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
836 } else {
837 $self->CFClient::UI::Base::find_widget ($x, $y)
838 }
839}
840
841sub _render {
842 my ($self) = @_;
843
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845
846 $self->SUPER::_render;
847}
848
849#############################################################################
850
851package CFClient::UI::ScrolledWindow;
852
853our @ISA = CFClient::UI::HBox::;
854
855sub new {
856 my $class = shift;
857
858 my $self;
859
860 my $slider = new CFClient::UI::Slider
861 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]);
865 },
866 ;
867
868 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider,
871 @_,
872 );
873
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider});
877
878 $self
879}
880
881sub size_allocate {
882 my ($self, $w, $h) = @_;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
888}
889
890#TODO# update range on size_allocate depending on child
891# update viewport offset on scroll
892
893#############################################################################
894
895package CFClient::UI::Frame;
896
897our @ISA = CFClient::UI::Bin::;
898
899use CFClient::OpenGL;
900
901sub new {
902 my $class = shift;
903
904 $class->SUPER::new (
905 bg => undef,
906 @_,
907 )
617} 908}
618 909
619sub _draw { 910sub _draw {
620 my ($self) = @_; 911 my ($self) = @_;
621 912
622 my ($w, $h) = ($self->{w}, $self->{h}); 913 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)};
623 915
624 glEnable GL_BLEND; 916 glEnable GL_BLEND;
625 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
626 glEnable GL_TEXTURE_2D; 918 glColor @{ $self->{bg} };
627 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
628 919
629# glBegin GL_QUADS; 920 glBegin GL_QUADS;
630# glColor 0, 0, 0, 0;
631# glVertex 0 , 0; 921 glVertex 0 , 0;
632# glVertex 0 , $h; 922 glVertex 0 , $h;
633# glVertex $w, $h; 923 glVertex $w, $h;
634# glVertex $w, 0; 924 glVertex $w, 0;
635# glEnd; 925 glEnd;
636 926
637
638 $self->child->draw;
639 glDisable GL_BLEND; 927 glDisable GL_BLEND;
640 glDisable GL_TEXTURE_2D; 928 }
929
930 $self->SUPER::_draw;
641} 931}
642 932
643############################################################################# 933#############################################################################
644 934
645package CFClient::UI::FancyFrame; 935package CFClient::UI::FancyFrame;
… …
656 my $class = shift; 946 my $class = shift;
657 947
658 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
659 949
660 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
663 border => 0.8, 953 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1,
664 @_ 956 @_
665 ); 957 );
666 958
667 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 960 align => 0,
669 valign => 1, 961 valign => 1,
670 text => $self->{title}, 962 text => $self->{title},
671 fontsize => 1; 963 fontsize => $self->{border};
672 964
673 $self 965 $self
674} 966}
675 967
676sub border { 968sub border {
677 int $_[0]{border} * $::FONTSIZE 969 int $_[0]{border} * $::FONTSIZE
678} 970}
679 971
680sub size_request { 972sub size_request {
681 my ($self) = @_; 973 my ($self) = @_;
682
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684 974
685 my ($w, $h) = $self->SUPER::size_request; 975 my ($w, $h) = $self->SUPER::size_request;
686 976
687 ( 977 (
688 $w + $self->border * 2, 978 $w + $self->border * 2,
… …
694 my ($self, $w, $h) = @_; 984 my ($self, $w, $h) = @_;
695 985
696 $h -= List::Util::max 0, $self->border * 2; 986 $h -= List::Util::max 0, $self->border * 2;
697 $w -= List::Util::max 0, $self->border * 2; 987 $w -= List::Util::max 0, $self->border * 2;
698 988
699 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
700 if $self->{title}; 990 if $self->{title};
701 991
702 $self->child->configure ($self->border, $self->border, $w, $h); 992 $self->child->configure ($self->border, $self->border, $w, $h);
703} 993}
704 994
705sub button_down { 995sub button_down {
706 my ($self, $ev, $x, $y) = @_; 996 my ($self, $ev, $x, $y) = @_;
707 997
998 my ($w, $h) = @$self{qw(w h)};
708 my $border = $self->border; 999 my $border = $self->border;
709 1000
710 if ($x < $self->{w} && $x >= $self->{w} - $border 1001 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711 && $y < $self->{h} && $y >= $self->{h} - $border) { 1002 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712 1003
1004 if ($lr & $td) {
1005 my ($wx, $wy) = ($self->{x}, $self->{y});
713 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1006 my ($ox, $oy) = ($ev->{x}, $ev->{y});
714 my ($bw, $bh) = ($self->{w}, $self->{h}); 1007 my ($bw, $bh) = ($self->{w}, $self->{h});
715 1008
1009 my $mx = $x < $border;
1010 my $my = $y < $border;
1011
716 $self->{motion} = sub { 1012 $self->{motion} = sub {
717 my ($ev, $x, $y) = @_; 1013 my ($ev, $x, $y) = @_;
718 1014
719 ($x, $y) = ($ev->{x}, $ev->{y}); 1015 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy;
720 1017
721 $self->{user_w} = $bw + $x - $ox; 1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
722 $self->{user_h} = $bh + $y - $oy; 1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
723 $self->check_size; 1021 $self->check_size;
724 }; 1022 };
725 1023
726 } elsif ($x >= 0 && $x < $self->{w} 1024 } elsif ($lr ^ $td) {
727 && $y >= 0 && $y < $border) {
728
729 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1025 my ($ox, $oy) = ($ev->{x}, $ev->{y});
730 my ($bx, $by) = ($self->{x}, $self->{y}); 1026 my ($bx, $by) = ($self->{x}, $self->{y});
731 1027
732 $self->{motion} = sub { 1028 $self->{motion} = sub {
733 my ($ev, $x, $y) = @_; 1029 my ($ev, $x, $y) = @_;
… …
756 my ($self) = @_; 1052 my ($self) = @_;
757 1053
758 my ($w, $h ) = ($self->{w}, $self->{h}); 1054 my ($w, $h ) = ($self->{w}, $self->{h});
759 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
760 1056
761 glEnable GL_BLEND;
762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
763 glEnable GL_TEXTURE_2D; 1057 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
765 1059
766 my $border = $self->border; 1060 my $border = $self->border;
767 1061
768 glColor @{ $self->{border_bg} }; 1062 glColor @{ $self->{border_bg} };
769 $tex[1]->draw_quad (0, 0, $w, $border); 1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
770 $tex[3]->draw_quad (0, $border, $border, $ch); 1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
771 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
772 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
773 1067
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
774 my $bg = $tex[0]; 1069 my $bg = $tex[0];
775 1070
776 # TODO: repeat texture not scale 1071 # TODO: repeat texture not scale
777 my $rep_x = $cw / $bg->{w}; 1072 my $rep_x = $cw / $bg->{w};
778 my $rep_y = $ch / $bg->{h}; 1073 my $rep_y = $ch / $bg->{h};
779 1074
780 glColor @{ $self->{bg} }; 1075 glColor @{ $self->{bg} };
781 1076
782 $bg->{s} = $rep_x; 1077 $bg->{s} = $rep_x;
783 $bg->{t} = $rep_y; 1078 $bg->{t} = $rep_y;
784 $bg->{wrap_mode} = 1; 1079 $bg->{wrap_mode} = 1;
785 $bg->draw_quad ($border, $border, $cw, $ch); 1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 }
786 1082
787 glDisable GL_TEXTURE_2D; 1083 glDisable GL_TEXTURE_2D;
788 glDisable GL_BLEND;
789 1084
790 $self->{title}->draw if $self->{title}; 1085 $self->{title}->draw if $self->{title};
1086
791 $self->child->draw; 1087 $self->child->draw;
792} 1088}
793 1089
794############################################################################# 1090#############################################################################
795 1091
… …
804sub new { 1100sub new {
805 my $class = shift; 1101 my $class = shift;
806 1102
807 $class->SUPER::new ( 1103 $class->SUPER::new (
808 col_expand => [], 1104 col_expand => [],
809 @_ 1105 @_,
810 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
811} 1111}
812 1112
813sub add { 1113sub add {
814 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
815 1115
816 $child->set_parent ($self); 1116 $child->set_parent ($self);
817 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
818 1118
819 $child->check_size; 1119 $self->check_size (1);
820} 1120}
821 1121
822# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
823sub clear { 1123sub clear {
824 my ($self) = @_; 1124 my ($self) = @_;
825 1125
1126 my @children = $self->children;
826 delete $self->{children}; 1127 delete $self->{children};
1128
1129 for (@children) {
1130 delete $_->{parent};
1131 $_->hide;
1132 }
1133
1134 $self->check_size (1);
827 $self->update; 1135 $self->update;
828} 1136}
829 1137
830sub get_wh { 1138sub get_wh {
831 my ($self) = @_; 1139 my ($self) = @_;
… …
837 or next; 1145 or next;
838 1146
839 for my $x (0 .. $#$row) { 1147 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 1148 my $widget = $row->[$x]
841 or next; 1149 or next;
842 my ($w, $h) = $widget->size_request; 1150 my ($w, $h) = @$widget{qw(req_w req_h)};
843 1151
844 $w[$x] = max $w[$x], $w; 1152 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 1153 $h[$y] = max $h[$y], $h;
846 } 1154 }
847 } 1155 }
… …
952 1260
953 ($h, $w) = ($w, $h); 1261 ($h, $w) = ($w, $h);
954 1262
955 my $children = $self->{children}; 1263 my $children = $self->{children};
956 1264
957 my @h = map +($_->size_request)[0], @$children; 1265 my @h = map $_->{req_w}, @$children;
958 1266
959 my $req_h = List::Util::sum @h; 1267 my $req_h = List::Util::sum @h;
960 1268
961 if ($req_h > $h) { 1269 if ($req_h > $h) {
962 # ah well, not enough space 1270 # ah well, not enough space
… …
1008} 1316}
1009 1317
1010sub size_allocate { 1318sub size_allocate {
1011 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1012 1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1013 my $children = $self->{children}; 1323 my $children = $self->{children};
1014 1324
1015 my @h = map +($_->size_request)[1], @$children; 1325 my @h = map $_->{req_h}, @$children;
1016 1326
1017 my $req_h = List::Util::sum @h; 1327 my $req_h = List::Util::sum @h;
1018 1328
1019 if ($req_h > $h) { 1329 if ($req_h > $h) {
1020 # ah well, not enough space 1330 # ah well, not enough space
… …
1046 1356
1047############################################################################# 1357#############################################################################
1048 1358
1049package CFClient::UI::Label; 1359package CFClient::UI::Label;
1050 1360
1051our @ISA = CFClient::UI::Base::; 1361our @ISA = CFClient::UI::DrawBG::;
1052 1362
1053use CFClient::OpenGL; 1363use CFClient::OpenGL;
1054 1364
1055sub new { 1365sub new {
1056 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1057 1367
1058 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1369 fg => [1, 1, 1],
1370 #bg => none
1371 #active_bg => none
1372 #font => default_font
1373 #text => initial text
1374 #markup => initial narkup
1375 #max_w => maximum pixel width
1376 ellipsise => 3, # end
1377 layout => (new CFClient::Layout),
1060 fontsize => 1, 1378 fontsize => 1,
1061 text => "",
1062 align => -1, 1379 align => -1,
1063 valign => -1, 1380 valign => -1,
1064 padding => 2, 1381 padding => 2,
1065 layout => new CFClient::Layout, 1382 can_events => 0,
1066 %arg 1383 %arg
1067 ); 1384 );
1068 1385
1069 if (exists $self->{template}) { 1386 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1387 my $layout = new CFClient::Layout;
1071 $layout->set_text (delete $self->{template}); 1388 $layout->set_text (delete $self->{template});
1072 $self->{template} = $layout; 1389 $self->{template} = $layout;
1073 } 1390 }
1074 1391
1075 $self->set_text (delete $self->{text}) if exists $self->{text}; 1392 if (exists $self->{markup}) {
1076 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1393 $self->set_markup (delete $self->{markup});
1394 } else {
1395 $self->set_text (delete $self->{text});
1396 }
1077 1397
1078 $self 1398 $self
1079} 1399}
1080 1400
1081sub escape_text { 1401sub escape($) {
1082 local $_ = $_[1]; 1402 local $_ = $_[0];
1083 1403
1084 s/&/&amp;/g; 1404 s/&/&amp;/g;
1085 s/>/&gt;/g; 1405 s/>/&gt;/g;
1086 s/</&lt;/g; 1406 s/</&lt;/g;
1087 1407
1088 $_[1] 1408 $_
1409}
1410
1411sub update {
1412 my ($self) = @_;
1413
1414 delete $self->{texture};
1415 $self->SUPER::update;
1089} 1416}
1090 1417
1091sub set_text { 1418sub set_text {
1092 my ($self, $text) = @_; 1419 my ($self, $text) = @_;
1093 1420
1421 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text";
1423
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1094 $self->{layout}->set_text ($text); 1425 $self->{layout}->set_text ($text);
1095 1426
1096 delete $self->{texture};
1097 $self->update; 1427 $self->update;
1428 $self->check_size;
1098} 1429}
1099 1430
1100sub set_markup { 1431sub set_markup {
1101 my ($self, $markup) = @_; 1432 my ($self, $markup) = @_;
1102 1433
1434 return if $self->{text} eq "M$markup";
1435 $self->{text} = "M$markup";
1436
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1103 $self->{layout}->set_markup ($markup); 1440 $self->{layout}->set_markup ($markup);
1104 1441
1105 delete $self->{texture};
1106 $self->update; 1442 $self->update;
1443 $self->check_size;
1107} 1444}
1108 1445
1109sub size_request { 1446sub size_request {
1110 my ($self) = @_; 1447 my ($self) = @_;
1111 1448
1112 $self->{layout}->set_width; 1449 $self->{layout}->set_font ($self->{font}) if $self->{font};
1450 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1454
1115 my ($w, $h) = $self->{layout}->size; 1455 my ($w, $h) = $self->{layout}->size;
1116 1456
1117 if (exists $self->{template}) { 1457 if (exists $self->{template}) {
1458 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1459 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1460
1120 my ($w2, $h2) = $self->{template}->size; 1461 my ($w2, $h2) = $self->{template}->size;
1121 1462
1122 $w = List::Util::max $w, $w2; 1463 $w = List::Util::max $w, $w2;
… …
1137 1478
1138sub set_fontsize { 1479sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1480 my ($self, $fontsize) = @_;
1140 1481
1141 $self->{fontsize} = $fontsize; 1482 $self->{fontsize} = $fontsize;
1483 delete $self->{texture};
1484
1485 $self->update;
1142 $self->check_size; 1486 $self->check_size;
1143} 1487}
1144 1488
1145sub _draw { 1489sub _draw {
1146 my ($self) = @_; 1490 my ($self) = @_;
1147 1491
1492 $self->SUPER::_draw; # draw background, if applicable
1493
1148 my $tex = $self->{texture} ||= do { 1494 my $tex = $self->{texture} ||= do {
1495 $self->{layout}->set_foreground (@{$self->{fg}});
1496 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $self->{layout}->set_width ($self->{w}); 1497 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501
1151 new_from_layout CFClient::Texture $self->{layout} 1502 my $tex = new_from_layout CFClient::Texture $self->{layout};
1503
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1506 : ($self->{w} - $tex->{w}) * 0.5);
1507
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1510 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1152 }; 1513 };
1153 1514
1154 glEnable GL_BLEND;
1155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1156 glEnable GL_TEXTURE_2D; 1515 glEnable GL_TEXTURE_2D;
1157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1158 1517
1518 if ($tex->{format} == GL_ALPHA) {
1159 glColor @{$self->{fg}}; 1519 glColor @{$self->{fg}};
1160
1161 $self->{ox} = int (
1162 $self->{align} < 0 ? $self->{padding}
1163 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1164 : ($self->{w} - $tex->{w}) * 0.5
1165 );
1166
1167 $self->{oy} = int (
1168 $self->{valign} < 0 ? $self->{padding}
1169 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1170 : ($self->{h} - $tex->{h}) * 0.5
1171 );
1172
1173 $tex->draw_quad ($self->{ox}, $self->{oy}); 1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1521 } else {
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1523 }
1174 1524
1175 glDisable GL_TEXTURE_2D; 1525 glDisable GL_TEXTURE_2D;
1176 glDisable GL_BLEND;
1177} 1526}
1178 1527
1179############################################################################# 1528#############################################################################
1180 1529
1181package CFClient::UI::EntryBase; 1530package CFClient::UI::EntryBase;
… …
1186 1535
1187sub new { 1536sub new {
1188 my $class = shift; 1537 my $class = shift;
1189 1538
1190 $class->SUPER::new ( 1539 $class->SUPER::new (
1191 fg => [1, 1, 1], 1540 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1541 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1542 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1543 active_fg => [0, 0, 0],
1195 can_hover => 1, 1544 can_hover => 1,
1196 can_focus => 1, 1545 can_focus => 1,
1197 valign => 0, 1546 valign => 0,
1547 can_events => 1,
1548 #text => ...
1198 @_ 1549 @_
1199 ) 1550 )
1200} 1551}
1201 1552
1202sub _set_text { 1553sub _set_text {
… …
1212 $self->{text} = $text; 1563 $self->{text} = $text;
1213 1564
1214 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1215 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1216 1567
1217 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1218}
1219
1220sub get_text {
1221 $_[0]{text}
1222}
1223
1224sub size_request {
1225 my ($self) = @_;
1226
1227 my ($w, $h) = $self->SUPER::size_request;
1228
1229 ($w + 1, $h) # add 1 for cursor
1230}
1231
1232sub size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 $self->_set_text ($self->{text});
1236} 1569}
1237 1570
1238sub set_text { 1571sub set_text {
1239 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1240 1573
1241 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1242 $self->_set_text ($text); 1575 $self->_set_text ($text);
1243 $self->update; 1576 $self->update;
1577 $self->check_size;
1578}
1579
1580sub get_text {
1581 $_[0]{text}
1582}
1583
1584sub size_request {
1585 my ($self) = @_;
1586
1587 my ($w, $h) = $self->SUPER::size_request;
1588
1589 ($w + 1, $h) # add 1 for cursor
1244} 1590}
1245 1591
1246sub key_down { 1592sub key_down {
1247 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1248 1594
… …
1250 my $sym = $ev->{sym}; 1596 my $sym = $ev->{sym};
1251 my $uni = $ev->{unicode}; 1597 my $uni = $ev->{unicode};
1252 1598
1253 my $text = $self->get_text; 1599 my $text = $self->get_text;
1254 1600
1255 if ($sym == 8) { 1601 if ($uni == 8) {
1256 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1602 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1257 } elsif ($sym == 127) { 1603 } elsif ($uni == 127) {
1258 substr $text, $self->{cursor}, 1, ""; 1604 substr $text, $self->{cursor}, 1, "";
1259 } elsif ($sym == CFClient::SDLK_LEFT) { 1605 } elsif ($sym == CFClient::SDLK_LEFT) {
1260 --$self->{cursor} if $self->{cursor}; 1606 --$self->{cursor} if $self->{cursor};
1261 } elsif ($sym == CFClient::SDLK_RIGHT) { 1607 } elsif ($sym == CFClient::SDLK_RIGHT) {
1262 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1608 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1263 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1264 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1265 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1266 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1267 } elsif ($sym == 27) { 1613 } elsif ($uni == 27) {
1268 $self->emit ('escape'); 1614 $self->_emit ('escape');
1269 } elsif ($uni) { 1615 } elsif ($uni) {
1270 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1271 } 1617 }
1272 1618
1273 $self->_set_text ($text); 1619 $self->_set_text ($text);
1274 $self->update; 1620 $self->update;
1621 $self->check_size;
1275} 1622}
1276 1623
1277sub focus_in { 1624sub focus_in {
1278 my ($self) = @_; 1625 my ($self) = @_;
1279 1626
… …
1355 my ($self, $ev) = @_; 1702 my ($self, $ev) = @_;
1356 1703
1357 my $sym = $ev->{sym}; 1704 my $sym = $ev->{sym};
1358 1705
1359 if ($sym == 13) { 1706 if ($sym == 13) {
1707 unshift @{$self->{history}},
1708 my $txt = $self->get_text;
1709 $self->{history_pointer} = -1;
1710 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1711 $self->_emit (activate => $txt);
1361 $self->update; 1712 $self->update;
1713
1714 } elsif ($sym == CFClient::SDLK_UP) {
1715 if ($self->{history_pointer} < 0) {
1716 $self->{history_saveback} = $self->get_text;
1717 }
1718 if (@{$self->{history} || []} > 0) {
1719 $self->{history_pointer}++;
1720 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1721 $self->{history_pointer} = @{$self->{history} || []} - 1;
1722 }
1723 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1724 }
1725
1726 } elsif ($sym == CFClient::SDLK_DOWN) {
1727 $self->{history_pointer}--;
1728 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1729
1730 if ($self->{history_pointer} >= 0) {
1731 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1732 } else {
1733 $self->set_text ($self->{history_saveback});
1734 }
1362 1735
1363 } else { 1736 } else {
1364 $self->SUPER::key_down ($ev); 1737 $self->SUPER::key_down ($ev);
1365 } 1738 }
1366 1739
… …
1380 1753
1381sub new { 1754sub new {
1382 my $class = shift; 1755 my $class = shift;
1383 1756
1384 $class->SUPER::new ( 1757 $class->SUPER::new (
1385 padding => 4, 1758 padding => 4,
1386 fg => [1, 1, 1], 1759 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1760 active_fg => [0, 0, 1],
1389 can_hover => 1, 1761 can_hover => 1,
1390 align => 0, 1762 align => 0,
1391 valign => 0, 1763 valign => 0,
1764 can_events => 1,
1392 @_ 1765 @_
1393 ) 1766 )
1394} 1767}
1395 1768
1769sub activate { }
1770
1396sub button_up { 1771sub button_up {
1397 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1398 1773
1774 $self->emit ("activate")
1399 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1400 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1401 $self->emit ("activate");
1402 }
1403} 1777}
1404 1778
1405sub _draw { 1779sub _draw {
1406 my ($self) = @_; 1780 my ($self) = @_;
1407 1781
… …
1409 1783
1410 if ($GRAB == $self) { 1784 if ($GRAB == $self) {
1411 $self->{fg} = $self->{active_fg}; 1785 $self->{fg} = $self->{active_fg};
1412 } 1786 }
1413 1787
1414 glEnable GL_BLEND;
1415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1416 glEnable GL_TEXTURE_2D; 1788 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418 glColor 0, 0, 0, 1; 1790 glColor 0, 0, 0, 1;
1419 1791
1420 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1792 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1421 1793
1422 glDisable GL_TEXTURE_2D; 1794 glDisable GL_TEXTURE_2D;
1423 glDisable GL_BLEND;
1424 1795
1425 $self->SUPER::_draw; 1796 $self->SUPER::_draw;
1426} 1797}
1427 1798
1428############################################################################# 1799#############################################################################
… …
1442 1813
1443 $class->SUPER::new ( 1814 $class->SUPER::new (
1444 padding => 2, 1815 padding => 2,
1445 fg => [1, 1, 1], 1816 fg => [1, 1, 1],
1446 active_fg => [1, 1, 0], 1817 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5],
1447 state => 0, 1820 state => 0,
1448 can_hover => 1, 1821 can_hover => 1,
1449 @_ 1822 @_
1450 ) 1823 )
1451} 1824}
… …
1460 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1461 1834
1462 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1463 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1464 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1465 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1466 } 1839 }
1467} 1840}
1468 1841
1469sub _draw { 1842sub _draw {
1470 my ($self) = @_; 1843 my ($self) = @_;
… …
1475 1848
1476 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1477 1850
1478 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1479 1852
1480 glEnable GL_BLEND; 1853 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854
1481 glEnable GL_TEXTURE_2D; 1855 glEnable GL_TEXTURE_2D;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483
1484 my $tex = $self->{state} ? $tex[1] : $tex[0];
1485
1486 $tex->draw_quad (0, 0, $s, $s); 1856 $tex->draw_quad_alpha (0, 0, $s, $s);
1487
1488 glDisable GL_TEXTURE_2D; 1857 glDisable GL_TEXTURE_2D;
1489 glDisable GL_BLEND;
1490} 1858}
1491 1859
1492############################################################################# 1860#############################################################################
1493 1861
1494package CFClient::UI::Image; 1862package CFClient::UI::Image;
… …
1501our %loaded_images; 1869our %loaded_images;
1502 1870
1503sub new { 1871sub new {
1504 my $class = shift; 1872 my $class = shift;
1505 1873
1506 my $self = $class->SUPER::new (@_); 1874 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1875
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1876 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1877
1510 $loaded_images{$self->{image}} ||= 1878 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1879 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1537 glTranslate 0, -$self->{w}, 0; 1905 glTranslate 0, -$self->{w}, 0;
1538 1906
1539 ($w, $h) = ($h, $w); 1907 ($w, $h) = ($h, $w);
1540 } 1908 }
1541 1909
1542 glEnable GL_BLEND;
1543 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1544 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1911 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1546 1912
1547 $tex->draw_quad (0, 0, $w, $h); 1913 $tex->draw_quad_alpha (0, 0, $w, $h);
1548 1914
1549 glDisable GL_BLEND;
1550 glDisable GL_TEXTURE_2D; 1915 glDisable GL_TEXTURE_2D;
1551} 1916}
1552 1917
1553############################################################################# 1918#############################################################################
1554 1919
1555package CFClient::UI::VGauge; 1920package CFClient::UI::VGauge;
1556 1921
1557our @ISA = CFClient::UI::Base::; 1922our @ISA = CFClient::UI::Base::;
1923
1924use List::Util qw(min max);
1558 1925
1559use CFClient::OpenGL; 1926use CFClient::OpenGL;
1560 1927
1561my %tex = ( 1928my %tex = (
1562 food => [ 1929 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1931 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1932 ],
1566 grace => [ 1933 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1934 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1935 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1936 ],
1570 hp => [ 1937 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1939 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1940 ],
1574 mana => [ 1941 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1943 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1944 ],
1578); 1945);
1579 1946
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 1947# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 1948sub new {
… …
1600} 1967}
1601 1968
1602sub set_max { 1969sub set_max {
1603 my ($self, $max) = @_; 1970 my ($self, $max) = @_;
1604 1971
1972 return if $self->{max_val} == $max;
1973
1605 $self->{max_val} = $max; 1974 $self->{max_val} = $max;
1975 $self->update;
1606} 1976}
1607 1977
1608sub set_value { 1978sub set_value {
1609 my ($self, $val, $max) = @_; 1979 my ($self, $val, $max) = @_;
1610 1980
1611 $self->set_max ($max) 1981 $self->set_max ($max)
1612 if defined $max; 1982 if defined $max;
1613 1983
1614 $max = $self->{max_val}; 1984 return if $self->{val} == $val;
1985
1615 $self->{val} = $val; 1986 $self->{val} = $val;
1616
1617 $self->update; 1987 $self->update;
1618} 1988}
1619 1989
1620sub _draw { 1990sub _draw {
1621 my ($self) = @_; 1991 my ($self) = @_;
1622 1992
1623 my $tex = $tex{$self->{type}}; 1993 my $tex = $tex{$self->{type}};
1994 my ($t1, $t2, $t3) = @$tex;
1624 1995
1625 my ($w, $h) = ($self->{w}, $self->{h}); 1996 my ($w, $h) = ($self->{w}, $self->{h});
1626 1997
1627 if ($self->{vertical}) { 1998 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 1999 glRotate 90, 0, 0, 1;
… …
1630 2001
1631 ($w, $h) = ($h, $w); 2002 ($w, $h) = ($h, $w);
1632 } 2003 }
1633 2004
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 2005 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 2006
1637 my $t1 = $tex->[0]; 2007 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 2008 my $ycut2 = max 0, min 1, $ycut - 1;
2009
2010 my $h1 = $self->{h} * (1 - $ycut1);
2011 my $h2 = $self->{h} * (1 - $ycut2);
1639 2012
1640 glEnable GL_BLEND; 2013 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2014 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 2015 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2016 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 2017
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2018 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 2019 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 2020 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2021 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2022 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2023 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 2024 glEnd;
1655 2025
2026 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2027 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 2028 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2029 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2030 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2031 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2032 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 2033 glEnd;
2034
2035 if ($t3) {
2036 glBindTexture GL_TEXTURE_2D, $t3->{name};
2037 glBegin GL_QUADS;
2038 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2039 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2040 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2041 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2042 glEnd;
2043 }
1663 2044
1664 glDisable GL_BLEND; 2045 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 2046 glDisable GL_TEXTURE_2D;
1666} 2047}
1667 2048
… …
1670package CFClient::UI::Gauge; 2051package CFClient::UI::Gauge;
1671 2052
1672our @ISA = CFClient::UI::VBox::; 2053our @ISA = CFClient::UI::VBox::;
1673 2054
1674sub new { 2055sub new {
1675 my ($class, %arg) = shift; 2056 my ($class, %arg) = @_;
1676 2057
1677 my $self = $class->SUPER::new ( 2058 my $self = $class->SUPER::new (
1678 @_, 2059 tooltip => $arg{type},
2060 can_hover => 1,
2061 can_events => 1,
2062 %arg,
1679 ); 2063 );
1680 2064
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2065 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2066 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2067 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 2068
1685 $self 2069 $self
1686} 2070}
1687 2071
1688sub set_fontsize { 2072sub set_fontsize {
… …
1690 2074
1691 $self->{value}->set_fontsize ($fsize); 2075 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 2076 $self->{max} ->set_fontsize ($fsize);
1693} 2077}
1694 2078
2079sub set_max {
2080 my ($self, $max) = @_;
2081
2082 $self->{gauge}->set_max ($max);
2083 $self->{max}->set_text ($max);
2084}
2085
1695sub set_value { 2086sub set_value {
1696 my ($self, $val, $max) = @_; 2087 my ($self, $val, $max) = @_;
1697 2088
1698 $self->set_max ($max) 2089 $self->set_max ($max)
1699 if defined $max; 2090 if defined $max;
1700 2091
1701 $self->{gauge}->set_value ($val, $max); 2092 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 2093 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 2094}
1711 2095
1712############################################################################# 2096#############################################################################
1713 2097
1714package CFClient::UI::Slider; 2098package CFClient::UI::Slider;
… …
1724 qw(s1_slider.png s1_slider_bg.png); 2108 qw(s1_slider.png s1_slider_bg.png);
1725 2109
1726sub new { 2110sub new {
1727 my $class = shift; 2111 my $class = shift;
1728 2112
1729 # range [value, low, high, page] 2113 # range [value, low, high, page, unit]
1730 2114
1731 # TODO: 0-width page 2115 # TODO: 0-width page
1732 # TODO: req_w/h are wrong with vertical 2116 # TODO: req_w/h are wrong with vertical
1733 # TODO: calculations are off 2117 # TODO: calculations are off
1734 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
1735 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
1736 active_fg => [0, 0, 0], 2120 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5],
1737 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
1738 req_w => 20, 2124 req_w => $::WIDTH / 80,
1739 req_h => 20, 2125 req_h => $::WIDTH / 80,
1740 vertical => 0, 2126 vertical => 0,
1741 can_hover => 1, 2127 can_hover => 1,
1742 inner_pad => 5, 2128 inner_pad => 0.02,
1743 @_ 2129 @_
1744 ); 2130 );
1745 2131
2132 $self->set_value ($self->{range}[0]);
2133 $self->update;
2134
1746 $self 2135 $self
2136}
2137
2138sub set_range {
2139 my ($self, $range) = @_;
2140
2141 $self->{range} = $range;
2142
2143 $self->update;
2144}
2145
2146sub set_value {
2147 my ($self, $value) = @_;
2148
2149 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2150
2151 $hi = $lo + 1 if $hi <= $lo;
2152
2153 $page = $hi - $lo if $page > $hi - $lo;
2154
2155 $value = $lo if $value < $lo;
2156 $value = $hi - $page if $value > $hi - $page;
2157
2158 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2159 if $unit;
2160
2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2162
2163 if ($value != $old_value) {
2164 $self->_emit (changed => $value);
2165 $self->update;
2166 }
1747} 2167}
1748 2168
1749sub size_request { 2169sub size_request {
1750 my ($self) = @_; 2170 my ($self) = @_;
1751 2171
… …
1757 2177
1758sub button_down { 2178sub button_down {
1759 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
1760 2180
1761 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::button_down ($ev, $x, $y);
2182
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184
1762 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
1763} 2186}
1764 2187
1765sub mouse_motion { 2188sub mouse_motion {
1766 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
1767 2190
1768 if ($GRAB == $self) { 2191 if ($GRAB == $self) {
2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2193
2194 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2199 }
2200}
2201
2202sub update {
2203 my ($self) = @_;
2204
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2206 $self->set_value ($self->{range}[0]);
2207
1769 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
1770 2210
1771 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1772 2212
1773 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2213 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1774 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2214 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1775 2215
1776 $x -= $inner_pad_px; # substract the padding 2216 $value = ($value - $lo) / $range;
1777 $x = $x * ($hi - $lo) / $inner_w + $lo; 2217 $value = $value * $self->{scale} + $self->{offset};
1778 $x = $lo if $x < $lo;
1779 $x = $hi - $page if $x > $hi - $page;
1780 $self->{range}[0] = $x;
1781 2218
1782 $self->emit (changed => $x); 2219 $self->{knob_x} = $value - $knob_w * 0.5;
1783 $self->update; 2220 $self->{knob_w} = $knob_w;
1784 } 2221 });
1785}
1786 2222
1787# the inner_* stuff is for generating a padding for the slider handle, 2223 $self->SUPER::update;
1788# so that the handle doesn't leave the texture. This calculation isn't 100%
1789# correct propably, but it does the job for now
1790sub _calc_inner_pad_px {
1791 my ($self, $w) = @_;
1792 ($w / 100) * $self->{inner_pad} # % to pixels
1793} 2224}
1794 2225
1795sub _draw { 2226sub _draw {
1796 my ($self) = @_; 2227 my ($self) = @_;
1797 2228
1798 $self->SUPER::_draw (); 2229 $self->SUPER::_draw ();
1799 2230
1800 my ($w, $h) = @$self{qw(w h)}; 2231 glScale $self->{w}, $self->{h};
1801 2232
1802 if ($self->{vertical}) { 2233 if ($self->{vertical}) {
1803 # draw a vertical slider like a rotated horizontal slider 2234 # draw a vertical slider like a rotated horizontal slider
1804 2235
2236 glTranslate 1, 0, 0;
1805 glRotate 90, 0, 0, 1; 2237 glRotate 90, 0, 0, 1;
1806 glTranslate 0, -$self->{w}, 0;
1807
1808 ($w, $h) = ($h, $w);
1809 } 2238 }
1810 2239
1811 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2240 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1812 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2241 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1813 2242
1814 my ($value, $lo, $hi, $page) = @{$self->{range}};
1815
1816 $hi = $value + 1 if $lo == $hi;
1817
1818 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1819 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1820
1821 $page = int $page * $inner_w / ($hi - $lo);
1822 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1823
1824 $w -= $page;
1825 $page &= ~1;
1826 glTranslate $page * 0.5, 0, 0;
1827 $page ||= 2;
1828
1829 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1830 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1831
1832 glEnable GL_BLEND;
1833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1834 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
1835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1836 2245
1837 # draw background 2246 # draw background
1838 $tex[1]->draw_quad (0, 0, $w, $h); 2247 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1839 2248
1840 # draw handle 2249 # draw handle
1841 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2250 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1842 2251
1843 glDisable GL_BLEND;
1844 glDisable GL_TEXTURE_2D; 2252 glDisable GL_TEXTURE_2D;
1845} 2253}
2254
2255#############################################################################
2256
2257package CFClient::UI::ValSlider;
2258
2259our @ISA = CFClient::UI::HBox::;
2260
2261sub new {
2262 my ($class, %arg) = @_;
2263
2264 my $range = delete $arg{range};
2265
2266 my $self = $class->SUPER::new (
2267 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2268 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2269 to_value => sub { shift },
2270 from_value => sub { shift },
2271 %arg,
2272 );
2273
2274 $self->{slider}->connect (changed => sub {
2275 my ($self, $value) = @_;
2276 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2277 $self->{parent}->emit (changed => $value);
2278 });
2279
2280# $self->{entry}->connect (changed => sub {
2281# my ($self, $value) = @_;
2282# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2283# $self->{parent}->emit (changed => $value);
2284# });
2285
2286 $self->add ($self->{slider}, $self->{entry});
2287
2288 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2289
2290 $self
2291}
2292
2293sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) }
1846 2295
1847############################################################################# 2296#############################################################################
1848 2297
1849package CFClient::UI::TextView; 2298package CFClient::UI::TextView;
1850 2299
… …
1854 2303
1855sub new { 2304sub new {
1856 my $class = shift; 2305 my $class = shift;
1857 2306
1858 my $self = $class->SUPER::new ( 2307 my $self = $class->SUPER::new (
1859 fontsize => 1, 2308 fontsize => 1,
2309 can_events => 0,
2310 #font => default_font
1860 @_, 2311 @_,
1861 2312
1862 layout => (new CFClient::Layout), 2313 layout => (new CFClient::Layout 1),
1863 par => [], 2314 par => [],
1864 height => 0, 2315 height => 0,
1865 children => [ 2316 children => [
1866 (new CFClient::UI::Empty expand => 1), 2317 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2318 (new CFClient::UI::Slider vertical => 1),
1868 ], 2319 ],
1869 ); 2320 );
1870 2321
1871 $self->{children}[1]->connect (changed => sub { 2322 $self->{children}[1]->connect (changed => sub { $self->update });
1872 $self->update;
1873 });
1874 2323
1875 $self 2324 $self
1876} 2325}
1877 2326
1878sub set_fontsize { 2327sub set_fontsize {
… …
1880 2329
1881 $self->{fontsize} = $fontsize; 2330 $self->{fontsize} = $fontsize;
1882 $self->reflow; 2331 $self->reflow;
1883} 2332}
1884 2333
2334sub size_allocate {
2335 my ($self, $w, $h) = @_;
2336
2337 $self->SUPER::size_allocate ($w, $h);
2338
2339 $self->{layout}->set_font ($self->{font}) if $self->{font};
2340 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341 $self->{layout}->set_width ($self->{children}[0]{w});
2342
2343 $self->reflow;
2344}
2345
1885sub text_height { 2346sub text_size {
1886 my ($self, $text) = @_; 2347 my ($self, $text, $indent) = @_;
1887 2348
1888 my $layout = $self->{layout}; 2349 my $layout = $self->{layout};
1889 2350
1890 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891 $layout->set_width ($self->{w}); 2352 $layout->set_width ($self->{children}[0]{w} - $indent);
1892 $layout->set_text ($text); 2353 $layout->set_markup ($text);
1893 2354
1894 ($layout->size)[1] 2355 $layout->size
1895} 2356}
1896 2357
1897sub reflow { 2358sub reflow {
1898 my ($self) = @_; 2359 my ($self) = @_;
1899 2360
1900 $self->{need_reflow}++; 2361 $self->{need_reflow}++;
1901 $self->update; 2362 $self->update;
1902} 2363}
1903 2364
1904sub size_allocate { 2365sub set_offset {
2366 my ($self, $offset) = @_;
2367
2368 # todo: base offset on lines or so, not on pixels
2369 $self->{children}[1]->set_value ($offset);
2370}
2371
2372sub clear {
1905 my ($self, $w, $h) = @_; 2373 my ($self) = @_;
1906 2374
1907 $self->SUPER::size_allocate ($w, $h); 2375 $self->{par} = [];
1908 2376 $self->{height} = 0;
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1910 $self->{layout}->set_width ($self->{children}[0]{w});
1911
1912 $self->reflow;
1913} 2378}
1914 2379
1915sub add_paragraph { 2380sub add_paragraph {
1916 my ($self, $color, $text) = @_; 2381 my ($self, $color, $text, $indent) = @_;
1917 2382
1918 #TODO: intelligently "reformat" paragraph 2383 for my $line (split /\n/, $text) {
1919 2384 my ($w, $h) = $self->text_size ($line);
1920 my $height = $self->text_height ($text);
1921
1922 $self->{height} += $height; 2385 $self->{height} += $h;
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2387 }
1923 2388
1924 push @{$self->{par}}, [$height, $color, $text];
1925
1926 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1927 $self->{children}[1]->update;
1928} 2390}
1929 2391
1930sub update { 2392sub update {
1931 my ($self) = @_; 2393 my ($self) = @_;
1932 2394
… …
1934 2396
1935 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
1936 2398
1937 delete $self->{texture}; 2399 delete $self->{texture};
1938 2400
1939 $ROOT->on_refresh ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
1940 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
1941 my $height = 0; 2405 my $height = 0;
1942 2406
1943 $height += $_->[0] = $self->text_height ($_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
1944 for @{$self->{par}}; 2411 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h;
2418 }
2419
2420 $height += $_->[1];
2421 }
1945 2422
1946 $self->{height} = $height; 2423 $self->{height} = $height;
1947 2424
1948 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1949 2426
1950 delete $self->{texture}; 2427 delete $self->{texture};
1951 } 2428 }
1952 2429
1953 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1954 glClearColor 0, 0, 0, 1; 2431 glClearColor 0.5, 0.5, 0.5, 0;
1955 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
1956 2433
2434 my $top = int $self->{children}[1]{range}[0];
2435
2436 my $y0 = $top;
2437 my $y1 = $top + $H;
2438
2439 my $y = 0;
2440
2441 my $layout = $self->{layout};
2442
2443 $layout->set_font ($self->{font}) if $self->{font};
2444
1957 glEnable GL_BLEND; 2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
1958 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1959 glEnable GL_TEXTURE_2D;
1960 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1961
1962 my $top = int $self->{children}[1]{range}[0];
1963
1964 my $y0 = $top;
1965 my $y1 = $top + $self->{h};
1966
1967 my $y = 0;
1968
1969 my $layout = $self->{layout};
1970 2448
1971 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2450 my $h = $par->[1];
1973 2451
1974 if ($y0 < $y + $h && $y < $y1) { 2452 if ($y0 < $y + $h && $y < $y1) {
2453 $layout->set_foreground (@{ $par->[2] });
2454 $layout->set_width ($W - $par->[3]);
1975 $layout->set_text ($par->[2]); 2455 $layout->set_markup ($par->[4]);
1976 2456
1977 glColor @{ $par->[1] }; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1978 my ($W, $H) = $layout->size; 2458
1979 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2459 glRasterPos $par->[3], $y - $y0;
2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1980 } 2461 }
1981 2462
1982 $y += $h; 2463 $y += $h;
1983 } 2464 }
1984 2465
1985 glDisable GL_TEXTURE_2D;
1986 glDisable GL_BLEND; 2466 glDisable GL_BLEND;
1987 }; 2467 };
1988 }); 2468 });
1989} 2469}
1990 2470
1991sub _draw { 2471sub _draw {
1992 my ($self) = @_; 2472 my ($self) = @_;
1993 2473
1994 if ($self->{texture}) {
1995 glEnable GL_TEXTURE_2D; 2474 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1;
1997 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1998 glDisable GL_TEXTURE_2D; 2478 glDisable GL_TEXTURE_2D;
1999 }
2000 2479
2001 $self->{children}[1]->draw; 2480 $self->{children}[1]->draw;
2002 2481
2003} 2482}
2004 2483
… …
2052 2531
2053sub new { 2532sub new {
2054 my $class = shift; 2533 my $class = shift;
2055 2534
2056 my $self = $class->SUPER::new ( 2535 my $self = $class->SUPER::new (
2057 state => 0, 2536 state => 0,
2058 connect_activate => \&toggle_flopper, 2537 connect_activate => \&toggle_flopper,
2059 @_ 2538 @_
2060 ); 2539 );
2061 2540
2062 if ($self->{state}) { 2541 if ($self->{state}) {
… …
2072 2551
2073 # TODO: use animation 2552 # TODO: use animation
2074 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2075 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2076 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2077 $self->emit ("open"); 2556 $self->_emit ("open");
2078 } else { 2557 } else {
2079 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2080 $self->emit ("close"); 2559 $self->_emit ("close");
2081 } 2560 }
2082 2561
2083 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2084} 2563}
2085 2564
2086############################################################################# 2565#############################################################################
2087 2566
2567package CFClient::UI::Tooltip;
2568
2569our @ISA = CFClient::UI::Bin::;
2570
2571use CFClient::OpenGL;
2572
2573sub new {
2574 my $class = shift;
2575
2576 $class->SUPER::new (
2577 @_,
2578 can_events => 0,
2579 )
2580}
2581
2582sub set_tooltip_from {
2583 my ($self, $widget) = @_;
2584
2585 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip},
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8,
2589 fg => [0, 0, 0, 1],
2590 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP),
2592 );
2593}
2594
2595sub size_request {
2596 my ($self) = @_;
2597
2598 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2599
2600 ($w + 4, $h + 4)
2601}
2602
2603sub size_allocate {
2604 my ($self, $w, $h) = @_;
2605
2606 $self->SUPER::size_allocate ($w - 4, $h - 4);
2607}
2608
2609sub _draw {
2610 my ($self) = @_;
2611
2612 glTranslate 0.375, 0.375;
2613
2614 my ($w, $h) = @$self{qw(w h)};
2615
2616 glColor 1, 0.8, 0.4;
2617 glBegin GL_QUADS;
2618 glVertex 0 , 0;
2619 glVertex 0 , $h;
2620 glVertex $w, $h;
2621 glVertex $w, 0;
2622 glEnd;
2623
2624 glColor 0, 0, 0;
2625 glBegin GL_LINE_LOOP;
2626 glVertex 0 , 0;
2627 glVertex 0 , $h;
2628 glVertex $w, $h;
2629 glVertex $w, 0;
2630 glEnd;
2631
2632 glTranslate 2 - 0.375, 2 - 0.375;
2633 $self->SUPER::_draw;
2634}
2635
2636#############################################################################
2637
2638package CFClient::UI::Face;
2639
2640our @ISA = CFClient::UI::Base::;
2641
2642use CFClient::OpenGL;
2643
2644sub new {
2645 my $class = shift;
2646
2647 my $self = $class->SUPER::new (
2648 aspect => 1,
2649 can_events => 0,
2650 @_,
2651 );
2652
2653 if ($self->{anim} && $self->{animspeed}) {
2654 Scalar::Util::weaken (my $widget = $self);
2655
2656 $self->{timer} = Event->timer (
2657 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2658 hard => 1,
2659 interval => $self->{animspeed},
2660 cb => sub {
2661 ++$widget->{frame};
2662 $widget->update;
2663 },
2664 );
2665 }
2666
2667 $self
2668}
2669
2670sub size_request {
2671 (32, 8)
2672}
2673
2674sub update {
2675 my ($self) = @_;
2676
2677 return unless $self->{visible};
2678
2679 $self->SUPER::update;
2680}
2681
2682sub _draw {
2683 my ($self) = @_;
2684
2685 return unless $::CONN;
2686
2687 my $face;
2688
2689 if ($self->{frame}) {
2690 my $anim = $::CONN->{anim}[$self->{anim}];
2691
2692 $face = $anim->[ $self->{frame} % @$anim ]
2693 if $anim && @$anim;
2694 }
2695
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2697
2698 if ($tex) {
2699 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D;
2704 }
2705}
2706
2707sub DESTROY {
2708 my ($self) = @_;
2709
2710 $self->{timer}->cancel
2711 if $self->{timer};
2712
2713 $self->SUPER::DESTROY;
2714}
2715
2716#############################################################################
2717
2718package CFClient::UI::Inventory;
2719
2720our @ISA = CFClient::UI::ScrolledWindow::;
2721
2722sub new {
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764
2765#############################################################################
2766
2767package CFClient::UI::Menu;
2768
2769our @ISA = CFClient::UI::FancyFrame::;
2770
2771use CFClient::OpenGL;
2772
2773sub new {
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 items => [],
2778 z => 100,
2779 @_,
2780 );
2781
2782 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2783
2784 for my $item (@{ $self->{items} }) {
2785 my ($widget, $cb) = @$item;
2786
2787 # handle various types of items, only text for now
2788 if (!ref $widget) {
2789 $widget = new CFClient::UI::Label
2790 can_hover => 1,
2791 can_events => 1,
2792 text => $widget;
2793 }
2794
2795 $self->{item}{$widget} = $item;
2796
2797 $self->{vbox}->add ($widget);
2798 }
2799
2800 $self
2801}
2802
2803# popup given the event (must be a mouse button down event currently)
2804sub popup {
2805 my ($self, $ev) = @_;
2806
2807 $self->_emit ("popdown");
2808
2809 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self;
2811 $self->{button} = $ev->{button};
2812
2813 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815}
2816
2817sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_;
2819
2820 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER};
2823}
2824
2825sub button_up {
2826 my ($self, $ev, $x, $y) = @_;
2827
2828 if ($ev->{button} == $self->{button}) {
2829 undef $GRAB;
2830 $self->hide;
2831
2832 $self->_emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover};
2834 }
2835}
2836
2837#############################################################################
2838
2839package CFClient::UI::Statusbox;
2840
2841our @ISA = CFClient::UI::VBox::;
2842
2843sub new {
2844 my $class = shift;
2845
2846 $class->SUPER::new (
2847 fontsize => 0.8,
2848 @_,
2849 )
2850}
2851
2852sub reorder {
2853 my ($self) = @_;
2854 my $NOW = time;
2855
2856 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 }
2859
2860 my @widgets;
2861
2862 my @items = sort {
2863 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} };
2866
2867 my $count = 10 + 1;
2868 for my $item (@items) {
2869 last unless --$count;
2870
2871 push @widgets, $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text};
2876
2877 for ($short) {
2878 s/^\s+//;
2879 s/\s+/ /g;
2880 }
2881
2882 new CFClient::UI::Label
2883 markup => $short,
2884 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg},
2890 can_events => 1,
2891 can_hover => 1
2892 };
2893 }
2894
2895 $self->clear;
2896 $self->SUPER::add (reverse @widgets);
2897}
2898
2899sub add {
2900 my ($self, $text, %arg) = @_;
2901
2902 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2906
2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2908
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910
2911 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) {
2913 $item->{count}++;
2914 } else {
2915 $item->{count} = 1;
2916 $item->{text} = $item->{tooltip} = $text;
2917 }
2918 $item->{id} = ++$self->{id};
2919 $item->{timeout} = $timeout;
2920 delete $item->{label};
2921 } else {
2922 $self->{item}{$group} = {
2923 id => ++$self->{id},
2924 text => $text,
2925 timeout => $timeout,
2926 tooltip => $text,
2927 fg => [0.8, 0.8, 0.8, 0.8],
2928 pri => 0,
2929 count => 1,
2930 %arg,
2931 };
2932 }
2933
2934 $self->reorder;
2935}
2936
2937sub reconfigure {
2938 my ($self) = @_;
2939
2940 delete $_->{label}
2941 for values %{ $self->{item} || {} };
2942
2943 $self->reorder;
2944 $self->SUPER::reconfigure;
2945}
2946
2947#############################################################################
2948
2088package CFClient::UI::Root; 2949package CFClient::UI::Root;
2089 2950
2090our @ISA = CFClient::UI::Container::; 2951our @ISA = CFClient::UI::Container::;
2091 2952
2092use CFClient::OpenGL; 2953use CFClient::OpenGL;
2093 2954
2094sub check_size { 2955sub new {
2095 my ($self) = @_; 2956 my $class = shift;
2096 2957
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 2958 $class->SUPER::new (
2098} 2959 @_,
2099 2960 )
2100sub size_request {
2101 ($::WIDTH, $::HEIGHT)
2102} 2961}
2103 2962
2104sub configure { 2963sub configure {
2105 my ($self, $x, $y, $w, $h) = @_; 2964 my ($self, $x, $y, $w, $h) = @_;
2106 2965
2107 $self->SUPER::configure ($x, $y, $w, $h); 2966 $self->{w} = $w;
2108 2967 $self->{h} = $h;
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2110 for @{$self->{children}};
2111} 2968}
2112 2969
2113sub _topleft { 2970sub check_size {
2971 my ($self) = @_;
2972
2973 $self->size_allocate ($self->{w}, $self->{h})
2974 if $self->{w};
2975}
2976
2977sub size_request {
2978 my ($self) = @_;
2979
2980 ($self->{w}, $self->{h})
2981}
2982
2983sub size_allocate {
2984 my ($self, $w, $h) = @_;
2985
2986 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2990 if exists $child->{req_x};
2991
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2993 if exists $child->{req_y};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997
2998 $child->configure ($X, $Y, $W, $H);
2999 }
3000}
3001
3002sub coord2local {
2114 my ($self, $x, $y) = @_; 3003 my ($self, $x, $y) = @_;
2115 3004
2116 ($x, $y) 3005 ($x, $y)
2117} 3006}
2118 3007
3008sub coord2global {
3009 my ($self, $x, $y) = @_;
3010
3011 ($x, $y)
3012}
3013
2119sub update { 3014sub update {
2120 my ($self) = @_; 3015 my ($self) = @_;
2121 3016
2122 $self->check_size; 3017 $self->check_size;
2123 ::refresh (); 3018 $::WANT_REFRESH++;
2124} 3019}
2125 3020
2126sub add { 3021sub add {
2127 my ($self, $child) = @_; 3022 my ($self, @children) = @_;
2128 3023
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1;
3032
2129 # integerize window positions 3033 # integerise window positions
2130 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
2131 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
3036 }
2132 3037
2133 $self->SUPER::add ($child); 3038 $self->SUPER::add (@children);
3039}
3040
3041sub remove {
3042 my ($self, @children) = @_;
3043
3044 $self->SUPER::remove (@children);
3045
3046 while (@children) {
3047 my $w = pop @children;
3048 push @children, $w->children;
3049 $w->set_invisible;
3050 }
2134} 3051}
2135 3052
2136sub on_refresh { 3053sub on_refresh {
2137 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
2138 3055
2139 $self->{refresh_hook}{$id} = $cb; 3056 $self->{refresh_hook}{$id} = $cb;
2140} 3057}
2141 3058
3059sub on_post_alloc {
3060 my ($self, $id, $cb) = @_;
3061
3062 $self->{post_alloc_hook}{$id} = $cb;
3063}
3064
2142sub draw { 3065sub draw {
2143 my ($self) = @_; 3066 my ($self) = @_;
2144 3067
2145 while (my $rcb = delete $self->{refresh_hook}) { 3068 while ($self->{refresh_hook}) {
2146 $_->() for values %$rcb; 3069 $_->()
3070 for values %{delete $self->{refresh_hook}};
3071 }
3072
3073 if ($self->{check_size}) {
3074 my @queue = ([], []);
3075
3076 for (;;) {
3077 if ($self->{check_size}) {
3078 # heuristic: check containers last
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3080 for values %{delete $self->{check_size}}
3081 }
3082
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3084
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3086 ? @$widget{qw(user_w user_h)}
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092
3093 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h;
3095
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3097
3098 $widget->{parent}->check_size
3099 if $widget->{parent};
3100 }
3101 }
3102 }
3103
3104 while ($self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) {
3106 my ($widget, $w, $h) = @$_;
3107
3108 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0;
3110
3111 $widget->{w} = $w;
3112 $widget->{h} = $h;
3113 $widget->emit (size_allocate => $w, $h);
3114 }
3115 }
3116
3117 while ($self->{post_alloc_hook}) {
3118 $_->()
3119 for values %{delete $self->{post_alloc_hook}};
2147 } 3120 }
2148 3121
2149 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3122 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2150 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2151 glClear GL_COLOR_BUFFER_BIT; 3124 glClear GL_COLOR_BUFFER_BIT;
2152 3125
2153 glMatrixMode GL_PROJECTION; 3126 glMatrixMode GL_PROJECTION;
2154 glLoadIdentity; 3127 glLoadIdentity;
2155 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2156 glMatrixMode GL_MODELVIEW; 3129 glMatrixMode GL_MODELVIEW;
2157 glLoadIdentity; 3130 glLoadIdentity;
2158 3131
2159 $self->_draw; 3132 $self->_draw;
2160} 3133}
… …
2162############################################################################# 3135#############################################################################
2163 3136
2164package CFClient::UI; 3137package CFClient::UI;
2165 3138
2166$ROOT = new CFClient::UI::Root; 3139$ROOT = new CFClient::UI::Root;
3140$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2167 3141
21681 31421
2169 3143

Diff Legend

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