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

Diff Legend

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