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.143 by root, Thu Apr 20 21:28:51 2006 UTC vs.
Revision 1.198 by root, Fri May 12 02:08:52 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
17sub check_tooltip {
18 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) {
23 $TOOLTIP->{owner} = $widget;
24
25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
29 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 delete $TOOLTIP->{owner};
50}
14 51
15# class methods for events 52# class methods for events
16sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
18} 56}
19 57
20sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
22} 61}
23 62
24sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
25 my ($ev) = @_; 64 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 67 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 68 my $widget = $ROOT->find_widget ($x, $y);
30 69
31 $GRAB = $widget; 70 $GRAB = $widget;
32 $GRAB->update if $GRAB; 71 $GRAB->update if $GRAB;
72
73 check_tooltip;
33 } 74 }
34 75
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 77
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 78 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y);
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
38} 82}
39 83
40sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
41 my ($ev) = @_; 85 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
43 87
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 89
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 91
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 92 if ($GRAB) {
93 ($x, $y) = $GRAB->coord2local ($x, $y);
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
49 96
50 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 99 $grab->update if $grab;
53 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
101
102 check_tooltip;
54 } 103 }
55} 104}
56 105
57sub feed_sdl_motion_event { 106sub feed_sdl_motion_event {
58 my ($ev) = @_; 107 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 112 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 113 my $hover = $HOVER; $HOVER = $widget;
65 114
66 $hover->update if $hover && $hover->{can_hover}; 115 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 117
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 118 check_tooltip;
119 }
120
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
71} 125}
72 126
73# convert position array to integers 127# convert position array to integers
74sub harmonize { 128sub harmonize {
75 my ($vals) = @_; 129 my ($vals) = @_;
… …
93 147
94sub new { 148sub new {
95 my $class = shift; 149 my $class = shift;
96 150
97 my $self = bless { 151 my $self = bless {
98 x => 0, 152 x => 0,
99 y => 0, 153 y => 0,
100 z => 0, 154 z => 0,
155 can_events => 1,
101 @_ 156 @_
102 }, $class; 157 }, $class;
103 158
104 for (keys %$self) { 159 for (keys %$self) {
105 if (/^connect_(.*)$/) { 160 if (/^connect_(.*)$/) {
… …
108 } 163 }
109 164
110 $self 165 $self
111} 166}
112 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
113sub show { 175sub show {
114 my ($self) = @_; 176 my ($self) = @_;
115 177
116 return if $self->{parent}; 178 return if $self->{parent};
117 179
… …
119} 181}
120 182
121sub hide { 183sub hide {
122 my ($self) = @_; 184 my ($self) = @_;
123 185
124 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
125 188
126 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
127} 191}
128 192
129sub move { 193sub move {
130 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
131 195
… …
134 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
135 199
136 $self->update; 200 $self->update;
137} 201}
138 202
139sub needs_redraw { 203sub set_size {
140 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
141} 210}
142 211
143sub size_request { 212sub size_request {
144 require Carp; 213 require Carp;
145 Carp::confess "size_request is abtract"; 214 Carp::confess "size_request is abstract";
146} 215}
147 216
148sub configure { 217sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 218 my ($self, $x, $y, $w, $h) = @_;
150 219
… …
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 221 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 222 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154 223
155 # use alignment to adjust x, y 224 # use alignment to adjust x, y
156 225
157 $x += ($w - $w2) * 0.5; 226 $x += int +($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5; 227 $y += int +($h - $h2) * 0.5;
159 228
160 ($w, $h) = ($w2, $h2); 229 ($w, $h) = ($w2, $h2);
161 } 230 }
162 231
163 if ($self->{x} != $x || $self->{y} != $y) { 232 if ($self->{x} != $x || $self->{y} != $y) {
… …
165 $self->{y} = $y; 234 $self->{y} = $y;
166 $self->update; 235 $self->update;
167 } 236 }
168 237
169 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
170 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
171 $self->{h} = $h;
172
173 $self->size_allocate ($w, $h);
174 $self->update;
175 } 240 }
176} 241}
177 242
178sub size_allocate { 243sub size_allocate {
179 # nothing to be done 244 # nothing to be done
180} 245}
181 246
182# return top left coordinates 247sub children {
183sub _topleft { 248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size {
184 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
185 263
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h;
187} 266}
188 267
189# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
190sub coord2local { 269sub coord2local {
191 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
192 271
193 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 273}
196 274
197# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
198sub coord2global { 276sub coord2global {
199 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
200 278
201 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 280}
204 281
205sub focus_in { 282sub focus_in {
206 my ($self) = @_; 283 my ($self) = @_;
207 284
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
269 glEnd; 346 glEnd;
270 glDisable GL_BLEND; 347 glDisable GL_BLEND;
271 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
272} 363}
273 364
274sub _draw { 365sub _draw {
275 my ($self) = @_; 366 my ($self) = @_;
276 367
277 warn "no draw defined for $self\n"; 368 warn "no draw defined for $self\n";
278} 369}
279 370
280sub find_widget { 371sub find_widget {
281 my ($self, $x, $y) = @_; 372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
282 375
283 return $self 376 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 379
… …
289 382
290sub set_parent { 383sub set_parent {
291 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
292 385
293 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
294} 392}
295 393
296sub check_size { 394sub check_size {
297 my ($self) = @_; 395 my ($self, $forced) = @_;
298 396
299 my ($w, $h) = $self->size_request; 397 $self->{force_alloc} = 1 if $forced;
300 398 $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} 399}
309 400
310sub update { 401sub update {
311 my ($self) = @_; 402 my ($self) = @_;
312 403
… …
321} 412}
322 413
323sub emit { 414sub emit {
324 my ($self, $signal, @args) = @_; 415 my ($self, $signal, @args) = @_;
325 416
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 418}
330 419
331sub DESTROY { 420sub DESTROY {
332 my ($self) = @_; 421 my ($self) = @_;
333 422
… …
378 467
379package CFClient::UI::Empty; 468package CFClient::UI::Empty;
380 469
381our @ISA = CFClient::UI::Base::; 470our @ISA = CFClient::UI::Base::;
382 471
472sub new {
473 my ($class, %arg) = @_;
474 $class->SUPER::new (can_events => 0, %arg);
475}
476
383sub size_request { 477sub size_request {
384 (0, 0) 478 (0, 0)
385} 479}
386 480
387sub draw { } 481sub draw { }
… …
395sub new { 489sub new {
396 my ($class, %arg) = @_; 490 my ($class, %arg) = @_;
397 491
398 my $children = delete $arg{children} || []; 492 my $children = delete $arg{children} || [];
399 493
400 my $self = $class->SUPER::new (children => [], %arg); 494 my $self = $class->SUPER::new (
495 children => [],
496 can_events => 0,
497 %arg,
498 );
401 $self->add ($_) for @$children; 499 $self->add ($_) for @$children;
402 500
403 $self 501 $self
404} 502}
405 503
406sub add { 504sub add {
407 my ($self, $child) = @_; 505 my ($self, @widgets) = @_;
408 506
409 $child->set_parent ($self); 507 $_->set_parent ($self)
508 for @widgets;
410 509
411 use sort 'stable'; 510 use sort 'stable';
412 511
413 $self->{children} = [ 512 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 513 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 514 @{$self->{children}}, @widgets
416 ]; 515 ];
417 516
418 $child->check_size; 517 $self->check_size (1);
518 $self->update;
519}
520
521sub children {
522 @{ $_[0]{children} }
419} 523}
420 524
421sub remove { 525sub remove {
422 my ($self, $child) = @_; 526 my ($self, $child) = @_;
423 527
424 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
425 530
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 532
428 $self->check_size; 533 $self->check_size;
534 $self->update;
535}
536
537sub clear {
538 my ($self) = @_;
539
540 my $children = delete $self->{children};
541 $self->{children} = [];
542
543 for (@$children) {
544 delete $_->{parent};
545 $_->hide;
546 }
547
548 $self->check_size;
549 $self->update;
429} 550}
430 551
431sub find_widget { 552sub find_widget {
432 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
433 554
… …
508} 629}
509 630
510sub update { 631sub update {
511 my ($self) = @_; 632 my ($self) = @_;
512 633
513 # we want to do this delayed... 634 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 635 $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} 636}
527 637
528sub size_allocate { 638sub size_allocate {
529 my ($self, $w, $h) = @_; 639 my ($self, $w, $h) = @_;
530 640
531 $self->child->configure (0, 0, $w, $h); 641 $self->SUPER::size_allocate ($w, $h);
642 $self->update;
643}
532 644
645sub _render {
646 $_[0]{children}[0]->draw;
647}
648
649sub render_child {
650 my ($self) = @_;
651
652 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
653 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT;
655
533 $self->render_chld; 656 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 };
534} 665}
535 666
536sub _draw { 667sub _draw {
537 my ($self) = @_; 668 my ($self) = @_;
538 669
539 my ($w, $h) = ($self->w, $self->h); 670 my ($w, $h) = ($self->w, $self->h);
540 671
541 my $tex = $self->{texture} 672 my $tex = $self->{texture}
542 or return; 673 or return;
543 674
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1;
548 678
549 $tex->draw_quad (0, 0, $w, $h); 679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 680
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
553} 682}
554 683
555############################################################################# 684#############################################################################
556 685
557package CFClient::UI::ViewPort; 686package CFClient::UI::ViewPort;
558 687
559our @ISA = CFClient::UI::Window::; 688our @ISA = CFClient::UI::Window::;
560 689
561sub new { die }
562
563sub size_request { 690sub size_request {
564 my ($self) = @_; 691 my ($self) = @_;
565 692
566 @$self{qw(child_w child_h)} = $self->child->size_request; 693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
568 695
569 @$self{qw(child_w child_h)} 696 @$self{qw(child_w child_h)}
570} 697}
571 698
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
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate { 699sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
701
702 $self->update;
703}
704
705sub set_offset {
706 my ($self, $x, $y) = @_;
707
708 $self->{view_x} = int $x;
709 $self->{view_y} = int $y;
710
711 $self->update;
712}
713
714# hmm, this does not work for topleft of $self... but we should not ask for that
715sub coord2local {
716 my ($self, $x, $y) = @_;
717
718 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
719}
720
721sub coord2global {
722 my ($self, $x, $y) = @_;
723
724 $x = List::Util::min $self->{w}, $x - $self->{view_x};
725 $y = List::Util::min $self->{h}, $y - $self->{view_y};
726
727 $self->SUPER::coord2global ($x, $y)
728}
729
730sub find_widget {
731 my ($self, $x, $y) = @_;
732
733 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
734 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
735 ) {
736 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
737 } else {
738 $self->CFClient::UI::Base::find_widget ($x, $y)
599 739 }
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601} 740}
602 741
603sub _draw { 742sub _render {
604 my ($self) = @_; 743 my ($self) = @_;
605 744
606 my $chld = $self->child; 745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
607 746
608 my ($w, $h) = $chld->size_request; 747 $self->SUPER::_render;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619} 748}
620 749
621############################################################################# 750#############################################################################
622 751
623package CFClient::UI::FancyFrame; 752package CFClient::UI::ScrolledWindow;
624 753
625our @ISA = CFClient::UI::Bin::; 754our @ISA = CFClient::UI::HBox::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 755
633sub new { 756sub new {
634 my $class = shift; 757 my $class = shift;
635 758
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
769 $self = $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort),
771 slider => $slider,
772 @_,
773 );
774
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
779 $self
780}
781
782#TODO# update range on size_allocate depeneing on child
783# update viewport offset on scroll
784
785#############################################################################
786
787package CFClient::UI::Frame;
788
789our @ISA = CFClient::UI::Bin::;
790
791use CFClient::OpenGL;
792
793#############################################################################
794
795package CFClient::UI::FancyFrame;
796
797our @ISA = CFClient::UI::Bin::;
798
799use CFClient::OpenGL;
800
801my @tex =
802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
803 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
804
805sub new {
806 my $class = shift;
807
636 # TODO: user_x, user_y, overwrite moveto? 808 # TODO: user_x, user_y, overwrite moveto?
637 809
638 my $self = $class->SUPER::new ( 810 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 811 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 812 border_bg => [1, 1, 1, 1],
641 border => 0.8, 813 border => 0.6,
814 can_events => 1,
642 @_ 815 @_
643 ); 816 );
644 817
645 $self->{title} &&= new CFClient::UI::Label 818 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 819 align => 0,
647 valign => 1, 820 valign => 1,
648 text => $self->{title}, 821 text => $self->{title},
649 fontsize => 1; 822 fontsize => $self->{border};
650 823
651 $self 824 $self
652} 825}
653 826
654sub border { 827sub border {
655 int $_[0]{border} * $::FONTSIZE 828 int $_[0]{border} * $::FONTSIZE
656} 829}
657 830
658sub size_request { 831sub size_request {
659 my ($self) = @_; 832 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 833
663 my ($w, $h) = $self->SUPER::size_request; 834 my ($w, $h) = $self->SUPER::size_request;
664 835
665 ( 836 (
666 $w + $self->border * 2, 837 $w + $self->border * 2,
… …
681} 852}
682 853
683sub button_down { 854sub button_down {
684 my ($self, $ev, $x, $y) = @_; 855 my ($self, $ev, $x, $y) = @_;
685 856
857 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 858 my $border = $self->border;
687 859
688 if ($x < $self->{w} && $x >= $self->{w} - $border 860 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 861 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 862
863 if ($lr & $td) {
864 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 865 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 866 my ($bw, $bh) = ($self->{w}, $self->{h});
693 867
868 my $mx = $x < $border;
869 my $my = $y < $border;
870
694 $self->{motion} = sub { 871 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 872 my ($ev, $x, $y) = @_;
696 873
697 ($x, $y) = ($ev->{x}, $ev->{y}); 874 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy;
698 876
699 $self->{user_w} = $bw + $x - $ox; 877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
701 $self->check_size; 880 $self->check_size;
702 }; 881 };
703 882
704 } elsif ($x >= 0 && $x < $self->{w} 883 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 884 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 885 my ($bx, $by) = ($self->{x}, $self->{y});
709 886
710 $self->{motion} = sub { 887 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 888 my ($ev, $x, $y) = @_;
… …
734 my ($self) = @_; 911 my ($self) = @_;
735 912
736 my ($w, $h ) = ($self->{w}, $self->{h}); 913 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
738 915
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 916 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 918
744 my $border = $self->border; 919 my $border = $self->border;
745 920
746 glColor @{ $self->{border_bg} }; 921 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 922 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
751 926
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
752 my $bg = $tex[0]; 928 my $bg = $tex[0];
753 929
754 # TODO: repeat texture not scale 930 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 931 my $rep_x = $cw / $bg->{w};
756 my $rep_y = $ch / $bg->{h}; 932 my $rep_y = $ch / $bg->{h};
757 933
758 glColor @{ $self->{bg} }; 934 glColor @{ $self->{bg} };
759 935
760 $bg->{s} = $rep_x; 936 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y; 937 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1; 938 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 939 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 }
764 941
765 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 943
768 $self->{title}->draw if $self->{title}; 944 $self->{title}->draw if $self->{title};
945
769 $self->child->draw; 946 $self->child->draw;
770} 947}
771 948
772############################################################################# 949#############################################################################
773 950
… …
795 $self->{children}[$y][$x] = $child; 972 $self->{children}[$y][$x] = $child;
796 973
797 $child->check_size; 974 $child->check_size;
798} 975}
799 976
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
800# TODO: move to container class maybe? send childs a signal on removal? 981# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 982sub clear {
802 my ($self) = @_; 983 my ($self) = @_;
803 984
985 my @children = $self->children;
804 delete $self->{children}; 986 delete $self->{children};
987
988 for (@children) {
989 delete $_->{parent};
990 $_->hide;
991 }
992
805 $self->update; 993 $self->update;
806} 994}
807 995
808sub get_wh { 996sub get_wh {
809 my ($self) = @_; 997 my ($self) = @_;
… …
815 or next; 1003 or next;
816 1004
817 for my $x (0 .. $#$row) { 1005 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1006 my $widget = $row->[$x]
819 or next; 1007 or next;
820 my ($w, $h) = $widget->size_request; 1008 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1009
822 $w[$x] = max $w[$x], $w; 1010 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1011 $h[$y] = max $h[$y], $h;
824 } 1012 }
825 } 1013 }
… …
930 1118
931 ($h, $w) = ($w, $h); 1119 ($h, $w) = ($w, $h);
932 1120
933 my $children = $self->{children}; 1121 my $children = $self->{children};
934 1122
935 my @h = map +($_->size_request)[0], @$children; 1123 my @h = map $_->{req_w}, @$children;
936 1124
937 my $req_h = List::Util::sum @h; 1125 my $req_h = List::Util::sum @h;
938 1126
939 if ($req_h > $h) { 1127 if ($req_h > $h) {
940 # ah well, not enough space 1128 # ah well, not enough space
… …
986} 1174}
987 1175
988sub size_allocate { 1176sub size_allocate {
989 my ($self, $w, $h) = @_; 1177 my ($self, $w, $h) = @_;
990 1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
991 my $children = $self->{children}; 1181 my $children = $self->{children};
992 1182
993 my @h = map +($_->size_request)[1], @$children; 1183 my @h = map $_->{req_h}, @$children;
994 1184
995 my $req_h = List::Util::sum @h; 1185 my $req_h = List::Util::sum @h;
996 1186
997 if ($req_h > $h) { 1187 if ($req_h > $h) {
998 # ah well, not enough space 1188 # ah well, not enough space
… …
1032 1222
1033sub new { 1223sub new {
1034 my ($class, %arg) = @_; 1224 my ($class, %arg) = @_;
1035 1225
1036 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1227 fg => [1, 1, 1],
1228 #font => default_font
1229 #text => initial text
1230 #markup => initial narkup
1231 layout => (new CFClient::Layout),
1038 fontsize => 1, 1232 fontsize => 1,
1039 text => "",
1040 align => -1, 1233 align => -1,
1041 valign => -1, 1234 valign => -1,
1042 padding => 2, 1235 padding => 2,
1043 layout => new CFClient::Layout, 1236 can_events => 0,
1044 %arg 1237 %arg
1045 ); 1238 );
1046 1239
1047 if (exists $self->{template}) { 1240 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1241 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1242 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1243 $self->{template} = $layout;
1051 } 1244 }
1052 1245
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1246 if (exists $self->{markup}) {
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1247 $self->set_markup (delete $self->{markup});
1248 } else {
1249 $self->set_text (delete $self->{text});
1250 }
1055 1251
1056 $self 1252 $self
1057} 1253}
1058 1254
1059sub escape_text { 1255sub escape {
1060 local $_ = $_[1]; 1256 local $_ = $_[1];
1061 1257
1062 s/&/&amp;/g; 1258 s/&/&amp;/g;
1063 s/>/&gt;/g; 1259 s/>/&gt;/g;
1064 s/</&lt;/g; 1260 s/</&lt;/g;
1065 1261
1066 $_[1] 1262 $_[1]
1067} 1263}
1068 1264
1265sub update {
1266 my ($self) = @_;
1267
1268 delete $self->{texture};
1269 $self->SUPER::update;
1270}
1271
1069sub set_text { 1272sub set_text {
1070 my ($self, $text) = @_; 1273 my ($self, $text) = @_;
1071 1274
1275 return if $self->{text} eq "T$text";
1276 $self->{text} = "T$text";
1277
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1072 $self->{layout}->set_text ($text); 1279 $self->{layout}->set_text ($text);
1073 1280
1074 delete $self->{texture};
1075 $self->update; 1281 $self->update;
1282 $self->check_size;
1076} 1283}
1077 1284
1078sub set_markup { 1285sub set_markup {
1079 my ($self, $markup) = @_; 1286 my ($self, $markup) = @_;
1080 1287
1288 return if $self->{text} eq "M$markup";
1289 $self->{text} = "M$markup";
1290
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1081 $self->{layout}->set_markup ($markup); 1294 $self->{layout}->set_markup ($markup);
1082 1295
1083 delete $self->{texture};
1084 $self->update; 1296 $self->update;
1297 $self->check_size;
1085} 1298}
1086 1299
1087sub size_request { 1300sub size_request {
1088 my ($self) = @_; 1301 my ($self) = @_;
1089 1302
1090 $self->{layout}->set_width; 1303 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1306
1093 my ($w, $h) = $self->{layout}->size; 1307 my ($w, $h) = $self->{layout}->size;
1094 1308
1095 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1310 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1311 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1312
1098 my ($w2, $h2) = $self->{template}->size; 1313 my ($w2, $h2) = $self->{template}->size;
1099 1314
1100 $w = List::Util::max $w, $w2; 1315 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1112 1327
1113 delete $self->{texture}; 1328 delete $self->{texture};
1114} 1329}
1115 1330
1331sub set_fontsize {
1332 my ($self, $fontsize) = @_;
1333
1334 $self->{fontsize} = $fontsize;
1335 delete $self->{texture};
1336
1337 $self->update;
1338 $self->check_size;
1339}
1340
1116sub _draw { 1341sub _draw {
1117 my ($self) = @_; 1342 my ($self) = @_;
1118 1343
1119 my $tex = $self->{texture} ||= do { 1344 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1347 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1349
1122 new_from_layout CFClient::Texture $self->{layout} 1350 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5;
1355
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5;
1359
1360 $tex
1123 }; 1361 };
1124 1362
1125 glEnable GL_BLEND;
1126 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1127 glEnable GL_TEXTURE_2D; 1363 glEnable GL_TEXTURE_2D;
1128 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1129 1365
1366 if ($tex->{format} == GL_ALPHA) {
1130 glColor @{$self->{fg}}; 1367 glColor @{$self->{fg}};
1131
1132 $self->{ox} = int (
1133 $self->{align} < 0 ? $self->{padding}
1134 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1135 : ($self->{w} - $tex->{w}) * 0.5
1136 );
1137
1138 $self->{oy} = int (
1139 $self->{valign} < 0 ? $self->{padding}
1140 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1141 : ($self->{h} - $tex->{h}) * 0.5
1142 );
1143
1144 $tex->draw_quad ($self->{ox}, $self->{oy}); 1368 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1369 } else {
1370 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1371 }
1145 1372
1146 glDisable GL_TEXTURE_2D; 1373 glDisable GL_TEXTURE_2D;
1147 glDisable GL_BLEND;
1148} 1374}
1149 1375
1150############################################################################# 1376#############################################################################
1151 1377
1152package CFClient::UI::EntryBase; 1378package CFClient::UI::EntryBase;
… …
1157 1383
1158sub new { 1384sub new {
1159 my $class = shift; 1385 my $class = shift;
1160 1386
1161 $class->SUPER::new ( 1387 $class->SUPER::new (
1162 fg => [1, 1, 1], 1388 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1389 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1390 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1391 active_fg => [0, 0, 0],
1166 can_hover => 1, 1392 can_hover => 1,
1167 can_focus => 1, 1393 can_focus => 1,
1168 valign => 0, 1394 valign => 0,
1395 can_events => 1,
1169 @_ 1396 @_
1170 ) 1397 )
1171} 1398}
1172 1399
1173sub _set_text { 1400sub _set_text {
… …
1186 $self->{layout}->set_text ("$text "); 1413 $self->{layout}->set_text ("$text ");
1187 1414
1188 $self->emit (changed => $self->{text}); 1415 $self->emit (changed => $self->{text});
1189} 1416}
1190 1417
1418sub set_text {
1419 my ($self, $text) = @_;
1420
1421 $self->{cursor} = length $text;
1422 $self->_set_text ($text);
1423 $self->check_size;
1424 $self->update;
1425}
1426
1191sub get_text { 1427sub get_text {
1192 $_[0]{text} 1428 $_[0]{text}
1193} 1429}
1194 1430
1195sub size_request { 1431sub size_request {
… …
1201} 1437}
1202 1438
1203sub size_allocate { 1439sub size_allocate {
1204 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1205 1441
1206 $self->_set_text ($self->{text}); 1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207}
1208
1209sub set_text {
1210 my ($self, $text) = @_;
1211
1212 $self->{cursor} = length $text;
1213 $self->_set_text ($text);
1214 $self->update;
1215} 1443}
1216 1444
1217sub key_down { 1445sub key_down {
1218 my ($self, $ev) = @_; 1446 my ($self, $ev) = @_;
1219 1447
… …
1326 my ($self, $ev) = @_; 1554 my ($self, $ev) = @_;
1327 1555
1328 my $sym = $ev->{sym}; 1556 my $sym = $ev->{sym};
1329 1557
1330 if ($sym == 13) { 1558 if ($sym == 13) {
1559 unshift @{$self->{history}},
1560 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = '';
1331 $self->emit (activate => $self->get_text); 1563 $self->emit (activate => $txt);
1332 $self->update; 1564 $self->update;
1565
1566 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text;
1569 }
1570 if (@{$self->{history} || []} > 0) {
1571 $self->{history_pointer}++;
1572 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1573 $self->{history_pointer} = @{$self->{history} || []} - 1;
1574 }
1575 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1576 }
1577
1578 } elsif ($sym == CFClient::SDLK_DOWN) {
1579 $self->{history_pointer}--;
1580 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1581
1582 if ($self->{history_pointer} >= 0) {
1583 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1584 } else {
1585 $self->set_text ($self->{history_saveback});
1586 }
1333 1587
1334 } else { 1588 } else {
1335 $self->SUPER::key_down ($ev); 1589 $self->SUPER::key_down ($ev);
1336 } 1590 }
1337 1591
… …
1344our @ISA = CFClient::UI::Label::; 1598our @ISA = CFClient::UI::Label::;
1345 1599
1346use CFClient::OpenGL; 1600use CFClient::OpenGL;
1347 1601
1348my @tex = 1602my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1604 qw(b1_button_active.png);
1351 1605
1352sub new { 1606sub new {
1353 my $class = shift; 1607 my $class = shift;
1354 1608
1355 $class->SUPER::new ( 1609 $class->SUPER::new (
1356 padding => 4, 1610 padding => 4,
1357 fg => [1, 1, 1], 1611 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1612 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1613 active_fg => [0, 0, 1],
1360 can_hover => 1, 1614 can_hover => 1,
1361 align => 0, 1615 align => 0,
1362 valign => 0, 1616 valign => 0,
1617 can_events => 1,
1363 @_ 1618 @_
1364 ) 1619 )
1365} 1620}
1366 1621
1367sub button_up { 1622sub button_up {
… …
1380 1635
1381 if ($GRAB == $self) { 1636 if ($GRAB == $self) {
1382 $self->{fg} = $self->{active_fg}; 1637 $self->{fg} = $self->{active_fg};
1383 } 1638 }
1384 1639
1385 glEnable GL_BLEND;
1386 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1387 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1389 glColor 0, 0, 0, 1; 1642 glColor 0, 0, 0, 1;
1390 1643
1391 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1644 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1392 1645
1393 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1394 glDisable GL_BLEND;
1395 1647
1396 $self->SUPER::_draw; 1648 $self->SUPER::_draw;
1397} 1649}
1398 1650
1399############################################################################# 1651#############################################################################
… …
1401package CFClient::UI::CheckBox; 1653package CFClient::UI::CheckBox;
1402 1654
1403our @ISA = CFClient::UI::DrawBG::; 1655our @ISA = CFClient::UI::DrawBG::;
1404 1656
1405my @tex = 1657my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1658 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1659 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1660
1409use CFClient::OpenGL; 1661use CFClient::OpenGL;
1410 1662
1411sub new { 1663sub new {
… …
1446 1698
1447 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1699 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1448 1700
1449 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1450 1702
1451 glEnable GL_BLEND; 1703 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704
1452 glEnable GL_TEXTURE_2D; 1705 glEnable GL_TEXTURE_2D;
1453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1454
1455 my $tex = $self->{state} ? $tex[1] : $tex[0];
1456
1457 $tex->draw_quad (0, 0, $s, $s); 1706 $tex->draw_quad_alpha (0, 0, $s, $s);
1458
1459 glDisable GL_TEXTURE_2D; 1707 glDisable GL_TEXTURE_2D;
1708}
1709
1710#############################################################################
1711
1712package CFClient::UI::Image;
1713
1714our @ISA = CFClient::UI::Base::;
1715
1716use CFClient::OpenGL;
1717use Carp qw/confess/;
1718
1719our %loaded_images;
1720
1721sub new {
1722 my $class = shift;
1723
1724 my $self = $class->SUPER::new (can_events => 0, @_);
1725
1726 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1727
1728 $loaded_images{$self->{image}} ||=
1729 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1730
1731 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1732
1733 Scalar::Util::weaken $loaded_images{$self->{image}};
1734
1735 $self->{aspect} = $tex->{w} / $tex->{h};
1736
1737 $self
1738}
1739
1740sub size_request {
1741 my ($self) = @_;
1742
1743 ($self->{tex}->{w}, $self->{tex}->{h})
1744}
1745
1746sub _draw {
1747 my ($self) = @_;
1748
1749 my $tex = $self->{tex};
1750
1751 my ($w, $h) = ($self->{w}, $self->{h});
1752
1753 if ($self->{rot90}) {
1754 glRotate 90, 0, 0, 1;
1755 glTranslate 0, -$self->{w}, 0;
1756
1757 ($w, $h) = ($h, $w);
1758 }
1759
1760 glEnable GL_TEXTURE_2D;
1761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1762
1763 $tex->draw_quad_alpha (0, 0, $w, $h);
1764
1460 glDisable GL_BLEND; 1765 glDisable GL_TEXTURE_2D;
1461} 1766}
1462 1767
1463############################################################################# 1768#############################################################################
1464 1769
1465package CFClient::UI::VGauge; 1770package CFClient::UI::VGauge;
1466 1771
1467our @ISA = CFClient::UI::Base::; 1772our @ISA = CFClient::UI::Base::;
1773
1774use List::Util qw(min max);
1468 1775
1469use CFClient::OpenGL; 1776use CFClient::OpenGL;
1470 1777
1471my %tex = ( 1778my %tex = (
1472 food => [ 1779 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1780 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1781 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1782 ],
1476 grace => [ 1783 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1784 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1785 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1786 ],
1480 hp => [ 1787 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1788 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1789 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1790 ],
1484 mana => [ 1791 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1792 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1793 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1794 ],
1488); 1795);
1489 1796
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1797# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1798sub new {
… …
1510} 1817}
1511 1818
1512sub set_max { 1819sub set_max {
1513 my ($self, $max) = @_; 1820 my ($self, $max) = @_;
1514 1821
1822 return if $self->{max_val} == $max;
1823
1515 $self->{max_val} = $max; 1824 $self->{max_val} = $max;
1825 $self->update;
1516} 1826}
1517 1827
1518sub set_value { 1828sub set_value {
1519 my ($self, $val, $max) = @_; 1829 my ($self, $val, $max) = @_;
1520 1830
1521 $self->set_max ($max) 1831 $self->set_max ($max)
1522 if defined $max; 1832 if defined $max;
1523 1833
1524 $max = $self->{max_val}; 1834 return if $self->{val} == $val;
1835
1525 $self->{val} = $val; 1836 $self->{val} = $val;
1526
1527 $self->update; 1837 $self->update;
1528} 1838}
1529 1839
1530sub _draw { 1840sub _draw {
1531 my ($self) = @_; 1841 my ($self) = @_;
1532 1842
1533 my $tex = $tex{$self->{type}}; 1843 my $tex = $tex{$self->{type}};
1844 my ($t1, $t2, $t3) = @$tex;
1534 1845
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1846 my ($w, $h) = ($self->{w}, $self->{h});
1536 1847
1537 if ($self->{vertical}) { 1848 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1; 1849 glRotate 90, 0, 0, 1;
… …
1540 1851
1541 ($w, $h) = ($h, $w); 1852 ($w, $h) = ($h, $w);
1542 } 1853 }
1543 1854
1544 my $ycut = $self->{val} / ($self->{max_val} || 1); 1855 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546 1856
1547 my $t1 = $tex->[0]; 1857 my $ycut1 = max 0, min 1, $ycut;
1548 my $t2 = $tex->[1]; 1858 my $ycut2 = max 0, min 1, $ycut - 1;
1859
1860 my $h1 = $self->{h} * (1 - $ycut1);
1861 my $h2 = $self->{h} * (1 - $ycut2);
1549 1862
1550 glEnable GL_BLEND; 1863 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1864 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D; 1865 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1867
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1868 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS; 1869 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0; 1870 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1871 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1872 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1873 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd; 1874 glEnd;
1565 1875
1876 my $ycut1 = List::Util::min 1, $ycut;
1566 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1877 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS; 1878 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1879 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1880 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1881 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1882 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1572 glEnd; 1883 glEnd;
1884
1885 if ($t3) {
1886 glBindTexture GL_TEXTURE_2D, $t3->{name};
1887 glBegin GL_QUADS;
1888 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1889 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1890 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1891 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1892 glEnd;
1893 }
1573 1894
1574 glDisable GL_BLEND; 1895 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1576} 1897}
1577 1898
… …
1580package CFClient::UI::Gauge; 1901package CFClient::UI::Gauge;
1581 1902
1582our @ISA = CFClient::UI::VBox::; 1903our @ISA = CFClient::UI::VBox::;
1583 1904
1584sub new { 1905sub new {
1585 my ($class, %arg) = shift; 1906 my ($class, %arg) = @_;
1586 1907
1587 my $self = $class->SUPER::new ( 1908 my $self = $class->SUPER::new (
1588 @_, 1909 tooltip => $arg{type},
1910 can_hover => 1,
1911 can_events => 1,
1912 %arg,
1589 ); 1913 );
1590 1914
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1915 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1916 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1917 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1594 1918
1595 $self 1919 $self
1920}
1921
1922sub set_fontsize {
1923 my ($self, $fsize) = @_;
1924
1925 $self->{value}->set_fontsize ($fsize);
1926 $self->{max} ->set_fontsize ($fsize);
1927}
1928
1929sub set_max {
1930 my ($self, $max) = @_;
1931
1932 $self->{gauge}->set_max ($max);
1933 $self->{max}->set_text ($max);
1596} 1934}
1597 1935
1598sub set_value { 1936sub set_value {
1599 my ($self, $val, $max) = @_; 1937 my ($self, $val, $max) = @_;
1600 1938
1601 $self->set_max ($max) 1939 $self->set_max ($max)
1602 if defined $max; 1940 if defined $max;
1603 1941
1604 $self->{gauge}->set_value ($val, $max); 1942 $self->{gauge}->set_value ($val, $max);
1605 $self->{value}->set_text ($val); 1943 $self->{value}->set_text ($val);
1606}
1607
1608sub set_max {
1609 my ($self, $max) = @_;
1610
1611 $self->{gauge}->set_max ($max);
1612 $self->{max}->set_text ($max);
1613} 1944}
1614 1945
1615############################################################################# 1946#############################################################################
1616 1947
1617package CFClient::UI::Slider; 1948package CFClient::UI::Slider;
… …
1636 # TODO: calculations are off 1967 # TODO: calculations are off
1637 my $self = $class->SUPER::new ( 1968 my $self = $class->SUPER::new (
1638 fg => [1, 1, 1], 1969 fg => [1, 1, 1],
1639 active_fg => [0, 0, 0], 1970 active_fg => [0, 0, 0],
1640 range => [0, 0, 100, 10], 1971 range => [0, 0, 100, 10],
1641 req_w => 20, 1972 req_w => $::WIDTH / 80,
1642 req_h => 20, 1973 req_h => $::WIDTH / 80,
1643 vertical => 0, 1974 vertical => 0,
1644 can_hover => 1, 1975 can_hover => 1,
1645 inner_pad => 5, 1976 inner_pad => 5,
1646 @_ 1977 @_
1647 ); 1978 );
… …
1730 $page ||= 2; 2061 $page ||= 2;
1731 2062
1732 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1733 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1734 2065
1735 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737 glEnable GL_TEXTURE_2D; 2066 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 2068
1740 # draw background 2069 # draw background
1741 $tex[1]->draw_quad (0, 0, $w, $h); 2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1742 2071
1743 # draw handle 2072 # draw handle
1744 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1745 2074
1746 glDisable GL_BLEND;
1747 glDisable GL_TEXTURE_2D; 2075 glDisable GL_TEXTURE_2D;
1748} 2076}
1749 2077
1750############################################################################# 2078#############################################################################
1751 2079
… …
1757 2085
1758sub new { 2086sub new {
1759 my $class = shift; 2087 my $class = shift;
1760 2088
1761 my $self = $class->SUPER::new ( 2089 my $self = $class->SUPER::new (
1762 fontsize => 1, 2090 fontsize => 1,
2091 can_events => 0,
2092 #font => default_font
1763 @_, 2093 @_,
1764 2094
1765 layout => (new CFClient::Layout), 2095 layout => (new CFClient::Layout 1),
1766 par => [], 2096 par => [],
1767 height => 0, 2097 height => 0,
1768 children => [ 2098 children => [
1769 (new CFClient::UI::Empty expand => 1), 2099 (new CFClient::UI::Empty expand => 1),
1770 (new CFClient::UI::Slider vertical => 1), 2100 (new CFClient::UI::Slider vertical => 1),
1771 ], 2101 ],
1772 ); 2102 );
1773 2103
1774 $self->{children}[1]->connect (changed => sub { 2104 $self->{children}[1]->connect (changed => sub { $self->update });
1775 $self->update;
1776 });
1777 2105
1778 $self 2106 $self
1779} 2107}
1780 2108
1781sub set_fontsize { 2109sub set_fontsize {
… …
1789 my ($self, $text) = @_; 2117 my ($self, $text) = @_;
1790 2118
1791 my $layout = $self->{layout}; 2119 my $layout = $self->{layout};
1792 2120
1793 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1794 $layout->set_width ($self->{w}); 2122 $layout->set_width ($self->{children}[0]{w});
1795 $layout->set_text ($text); 2123 $layout->set_markup ($text);
1796 2124
1797 ($layout->size)[1] 2125 ($layout->size)[1]
1798} 2126}
1799 2127
1800sub reflow { 2128sub reflow {
… …
1807sub size_allocate { 2135sub size_allocate {
1808 my ($self, $w, $h) = @_; 2136 my ($self, $w, $h) = @_;
1809 2137
1810 $self->SUPER::size_allocate ($w, $h); 2138 $self->SUPER::size_allocate ($w, $h);
1811 2139
2140 $self->{layout}->set_font ($self->{font}) if $self->{font};
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w}); 2142 $self->{layout}->set_width ($self->{children}[0]{w});
1814 2143
1815 $self->reflow; 2144 $self->reflow;
1816} 2145}
… …
1837 2166
1838 return unless $self->{h} > 0; 2167 return unless $self->{h} > 0;
1839 2168
1840 delete $self->{texture}; 2169 delete $self->{texture};
1841 2170
1842 $ROOT->on_refresh ($self, sub { 2171 $ROOT->on_post_alloc ($self, sub {
1843 if (delete $self->{need_reflow}) { 2172 if (delete $self->{need_reflow}) {
1844 my $height = 0; 2173 my $height = 0;
1845 2174
1846 $height += $_->[0] = $self->text_height ($_->[2]) 2175 $height += $_->[0] = $self->text_height ($_->[2])
1847 for @{$self->{par}}; 2176 for @{$self->{par}};
… …
1851 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1852 2181
1853 delete $self->{texture}; 2182 delete $self->{texture};
1854 } 2183 }
1855 2184
1856 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1857 glClearColor 0, 0, 0, 1; 2186 glClearColor 0, 0, 0, 0;
1858 glClear GL_COLOR_BUFFER_BIT; 2187 glClear GL_COLOR_BUFFER_BIT;
1859 2188
1860 glEnable GL_BLEND;
1861 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1862 glEnable GL_TEXTURE_2D; 2189 glEnable GL_TEXTURE_2D;
1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1864 2191
1865 my $top = int $self->{children}[1]{range}[0]; 2192 my $top = int $self->{children}[1]{range}[0];
1866 2193
… …
1869 2196
1870 my $y = 0; 2197 my $y = 0;
1871 2198
1872 my $layout = $self->{layout}; 2199 my $layout = $self->{layout};
1873 2200
2201 $layout->set_font ($self->{font}) if $self->{font};
2202
1874 for my $par (@{$self->{par}}) { 2203 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0]; 2204 my $h = $par->[0];
1876 2205
1877 if ($y0 < $y + $h && $y < $y1) { 2206 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] });
1878 $layout->set_text ($par->[2]); 2208 $layout->set_markup ($par->[2]);
1879 2209
1880 glColor @{ $par->[1] };
1881 my ($W, $H) = $layout->size; 2210 my ($W, $H) = $layout->size;
1882 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1883 } 2212 }
1884 2213
1885 $y += $h; 2214 $y += $h;
1886 } 2215 }
1887 2216
1888 glDisable GL_TEXTURE_2D; 2217 glDisable GL_TEXTURE_2D;
1889 glDisable GL_BLEND;
1890 }; 2218 };
1891 }); 2219 });
1892} 2220}
1893 2221
1894sub _draw { 2222sub _draw {
1895 my ($self) = @_; 2223 my ($self) = @_;
1896 2224
1897 if ($self->{texture}) {
1898 glEnable GL_TEXTURE_2D; 2225 glEnable GL_TEXTURE_2D;
1899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1900 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2227 glColor 1, 1, 1, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1901 glDisable GL_TEXTURE_2D; 2229 glDisable GL_TEXTURE_2D;
1902 }
1903 2230
1904 $self->{children}[1]->draw; 2231 $self->{children}[1]->draw;
1905 2232
1906} 2233}
1907 2234
… …
1955 2282
1956sub new { 2283sub new {
1957 my $class = shift; 2284 my $class = shift;
1958 2285
1959 my $self = $class->SUPER::new ( 2286 my $self = $class->SUPER::new (
1960 state => 0, 2287 state => 0,
1961 connect_activate => \&toggle_flopper, 2288 connect_activate => \&toggle_flopper,
1962 @_ 2289 @_
1963 ); 2290 );
1964 2291
1965 if ($self->{state}) { 2292 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2313 $self->emit (changed => $self->{state});
1987} 2314}
1988 2315
1989############################################################################# 2316#############################################################################
1990 2317
2318package CFClient::UI::Tooltip;
2319
2320our @ISA = CFClient::UI::Bin::;
2321
2322use CFClient::OpenGL;
2323
2324sub new {
2325 my $class = shift;
2326
2327 $class->SUPER::new (
2328 @_,
2329 can_events => 0,
2330 )
2331}
2332
2333sub set_tooltip_from {
2334 my ($self, $widget) = @_;
2335
2336 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8,
2340 fg => [0, 0, 0, 1],
2341 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 );
2343}
2344
2345sub size_request {
2346 my ($self) = @_;
2347
2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2349
2350 ($w + 4, $h + 4)
2351}
2352
2353sub size_allocate {
2354 my ($self, $w, $h) = @_;
2355
2356 $self->SUPER::size_allocate ($w - 4, $h - 4);
2357}
2358
2359sub _draw {
2360 my ($self) = @_;
2361
2362 glTranslate 0.375, 0.375;
2363
2364 my ($w, $h) = @$self{qw(w h)};
2365
2366 glColor 1, 0.8, 0.4;
2367 glBegin GL_QUADS;
2368 glVertex 0 , 0;
2369 glVertex 0 , $h;
2370 glVertex $w, $h;
2371 glVertex $w, 0;
2372 glEnd;
2373
2374 glColor 0, 0, 0;
2375 glBegin GL_LINE_LOOP;
2376 glVertex 0 , 0;
2377 glVertex 0 , $h;
2378 glVertex $w, $h;
2379 glVertex $w, 0;
2380 glEnd;
2381
2382 glTranslate 2 - 0.375, 2 - 0.375;
2383 $self->SUPER::_draw;
2384}
2385
2386#############################################################################
2387
2388package CFClient::UI::Face;
2389
2390our @ISA = CFClient::UI::Base::;
2391
2392use CFClient::OpenGL;
2393
2394sub new {
2395 my $class = shift;
2396
2397 $class->SUPER::new (
2398 aspect => 1,
2399 @_,
2400 )
2401}
2402
2403sub size_request {
2404 (32, 8)
2405}
2406
2407sub _draw {
2408 my ($self) = @_;
2409
2410 return unless $::CONN;#d# manage and cache textures differently
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2412
2413 # TODO animation
2414 if ($tex) {
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D;
2420 }
2421}
2422
2423#############################################################################
2424
2425package CFClient::UI::InventoryItem;
2426
2427our @ISA = CFClient::UI::HBox::;
2428
2429sub new {
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Menu;
2535
2536our @ISA = CFClient::UI::FancyFrame::;
2537
2538use CFClient::OpenGL;
2539
2540sub new {
2541 my $class = shift;
2542
2543 my $self = $class->SUPER::new (
2544 items => [],
2545 z => 100,
2546 @_,
2547 );
2548
2549 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2550
2551 for my $item (@{ $self->{items} }) {
2552 my ($widget, $cb) = @$item;
2553
2554 # handle various types of items, only text for now
2555 if (!ref $widget) {
2556 $widget = new CFClient::UI::Label
2557 can_hover => 1,
2558 can_events => 1,
2559 text => $widget;
2560 }
2561
2562 $self->{item}{$widget} = $item;
2563
2564 $self->{vbox}->add ($widget);
2565 }
2566
2567 $self
2568}
2569
2570# popup given the event (must be a mouse button down event currently)
2571sub popup {
2572 my ($self, $ev) = @_;
2573
2574 $self->emit ("popdown");
2575
2576 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self;
2578 $self->{button} = $ev->{button};
2579
2580 $self->show;
2581 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2582}
2583
2584sub mouse_motion {
2585 my ($self, $ev, $x, $y) = @_;
2586
2587 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER};
2590}
2591
2592sub button_up {
2593 my ($self, $ev, $x, $y) = @_;
2594
2595 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB;
2597 $self->hide;
2598
2599 $self->emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover};
2601 }
2602}
2603
2604#############################################################################
2605
2606package CFClient::UI::Statusbox;
2607
2608our @ISA = CFClient::UI::VBox::;
2609
2610sub reorder {
2611 my ($self) = @_;
2612 my $NOW = time;
2613
2614 while (my ($k, $v) = each %{ $self->{item} }) {
2615 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2616 }
2617
2618 my @widgets;
2619
2620 my @items = sort {
2621 $a->{pri} <=> $b->{pri}
2622 or $b->{id} <=> $a->{id}
2623 } values %{ $self->{item} };
2624
2625 my $count = 10 + 1;
2626 for my $item (@items) {
2627 last unless --$count;
2628
2629 push @widgets, $item->{label} ||= do {
2630 # TODO: doesn't handle markup well (read as: at all)
2631 my $short = $item->{count} > 1
2632 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text};
2634
2635 for ($short) {
2636 s/^\s+//;
2637 s/\012.*/…/s;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 }
2641
2642 new CFClient::UI::Label
2643 markup => $short,
2644 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize},
2648 color => $item->{color},
2649 can_events => 1,
2650 can_hover => 1
2651 };
2652 }
2653
2654 $self->clear;
2655 $self->SUPER::add (reverse @widgets);
2656}
2657
2658sub add {
2659 my ($self, $text, %arg) = @_;
2660
2661 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//;
2663
2664 my $timeout = time + ((delete $arg{timeout}) || 60);
2665
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667
2668 if (my $item = $self->{item}{$group}) {
2669 if ($item->{text} eq $text) {
2670 $item->{count}++;
2671 } else {
2672 $item->{count} = 1;
2673 $item->{text} = $item->{tooltip} = $text;
2674 }
2675 $item->{id} = ++$self->{id};
2676 $item->{timeout} = $timeout;
2677 delete $item->{label};
2678 } else {
2679 $self->{item}{$group} = {
2680 id => ++$self->{id},
2681 text => $text,
2682 timeout => $timeout,
2683 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0,
2687 count => 1,
2688 %arg,
2689 };
2690 }
2691
2692 $self->reorder;
2693}
2694
2695#############################################################################
2696
1991package CFClient::UI::Root; 2697package CFClient::UI::Root;
1992 2698
1993our @ISA = CFClient::UI::Container::; 2699our @ISA = CFClient::UI::Container::;
1994 2700
1995use CFClient::OpenGL; 2701use CFClient::OpenGL;
1996 2702
1997sub check_size { 2703sub new {
1998 my ($self) = @_; 2704 my $class = shift;
1999 2705
2000 $self->configure (0, 0, $::WITH, $::HEIGHT); 2706 $class->SUPER::new (
2001} 2707 @_,
2002 2708 )
2003sub size_request {
2004 ($::WIDTH, $::HEIGHT)
2005} 2709}
2006 2710
2007sub configure { 2711sub configure {
2008 my ($self, $x, $y, $w, $h) = @_; 2712 my ($self, $x, $y, $w, $h) = @_;
2009 2713
2010 $self->SUPER::configure ($x, $y, $w, $h); 2714 $self->{w} = $w;
2011 2715 $self->{h} = $h;
2012 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2013 for @{$self->{children}};
2014} 2716}
2015 2717
2016sub _topleft { 2718sub check_size {
2719 my ($self) = @_;
2720
2721 $self->size_allocate ($self->{w}, $self->{h})
2722 if $self->{w};
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727
2728 ($self->{w}, $self->{h})
2729}
2730
2731sub size_allocate {
2732 my ($self, $w, $h) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749
2750 for my $child ($self->children) {
2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2755 $child->configure ($X, $Y, $W, $H);
2756 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760}
2761
2762sub coord2local {
2017 my ($self, $x, $y) = @_; 2763 my ($self, $x, $y) = @_;
2018 2764
2019 ($x, $y) 2765 ($x, $y)
2020} 2766}
2021 2767
2768sub coord2global {
2769 my ($self, $x, $y) = @_;
2770
2771 ($x, $y)
2772}
2773
2022sub update { 2774sub update {
2023 my ($self) = @_; 2775 my ($self) = @_;
2024 2776
2025 $self->check_size; 2777 $self->check_size;
2026 ::refresh (); 2778 $::WANT_REFRESH++;
2027} 2779}
2028 2780
2029sub add { 2781sub add {
2030 my ($self, $child) = @_; 2782 my ($self, $child) = @_;
2031 2783
2784 # integerise window positions
2785 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y};
2787
2032 $self->SUPER::add ($child); 2788 $self->SUPER::add ($child);
2033} 2789}
2034 2790
2035sub on_refresh { 2791sub on_refresh {
2036 my ($self, $id, $cb) = @_; 2792 my ($self, $id, $cb) = @_;
2037 2793
2038 $self->{refresh_hook}{$id} = $cb; 2794 $self->{refresh_hook}{$id} = $cb;
2039} 2795}
2040 2796
2797sub on_post_alloc {
2798 my ($self, $id, $cb) = @_;
2799
2800 $self->{post_alloc_hook}{$id} = $cb;
2801}
2802
2041sub draw { 2803sub draw {
2042 my ($self) = @_; 2804 my ($self) = @_;
2043 2805
2044 while (my $rcb = delete $self->{refresh_hook}) { 2806 while ($self->{refresh_hook}) {
2045 $_->() for values %$rcb; 2807 $_->()
2808 for values %{delete $self->{refresh_hook}};
2809 }
2810
2811 if ($self->{check_size}) {
2812 my @queue = ([], []);
2813
2814 for (;;) {
2815 if ($self->{check_size}) {
2816 # heuristic: check containers last
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2818 for values %{delete $self->{check_size}}
2819 }
2820
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2822
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2824 ? @$widget{qw(user_w user_h)}
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830
2831 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h;
2833
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2835
2836 $widget->{parent}->check_size
2837 if $widget->{parent};
2838 }
2839 }
2840 }
2841
2842 while ($self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) {
2844 my ($widget, $w, $h) = @$_;
2845
2846 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0;
2848
2849 $widget->{w} = $w;
2850 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h);
2852 $widget->emit (size_allocate => $w, $h);
2853 }
2854 }
2855
2856 while ($self->{post_alloc_hook}) {
2857 $_->()
2858 for values %{delete $self->{post_alloc_hook}};
2046 } 2859 }
2047 2860
2048 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2861 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2049 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2050 glClear GL_COLOR_BUFFER_BIT; 2863 glClear GL_COLOR_BUFFER_BIT;
… …
2061############################################################################# 2874#############################################################################
2062 2875
2063package CFClient::UI; 2876package CFClient::UI;
2064 2877
2065$ROOT = new CFClient::UI::Root; 2878$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip;
2066 2880
20671 28811
2068 2882

Diff Legend

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