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.133 by root, Tue Apr 18 21:39:31 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->motion_x, $ev->motion_y); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
27 66
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;
33 }
34 72
73 check_tooltip;
74 }
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->motion_x, $ev->motion_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) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 108 my ($x, $y) = ($ev->{x}, $ev->{y});
60 109
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 110 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 111
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) = @_;
… …
87 141
88package CFClient::UI::Base; 142package CFClient::UI::Base;
89 143
90use strict; 144use strict;
91 145
92use SDL::OpenGL; 146use CFClient::OpenGL;
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,
101 w => -1, 155 can_events => 1,
102 h => -1,
103 @_ 156 @_
104 }, $class; 157 }, $class;
105 158
106 for (keys %$self) { 159 for (keys %$self) {
107 if (/^connect_(.*)$/) { 160 if (/^connect_(.*)$/) {
… …
110 } 163 }
111 164
112 $self 165 $self
113} 166}
114 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
175sub show {
176 my ($self) = @_;
177
178 return if $self->{parent};
179
180 $CFClient::UI::ROOT->add ($self);
181}
182
183sub hide {
184 my ($self) = @_;
185
186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
188
189 $self->{parent}->remove ($self)
190 if $self->{parent};
191}
192
115sub move { 193sub move {
116 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
117 195
118 $self->{x} = int $x; 196 $self->{x} = int $x;
119 $self->{y} = int $y; 197 $self->{y} = int $y;
120 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
121 199
122 $self->update; 200 $self->update;
123} 201}
124 202
125sub needs_redraw { 203sub set_size {
126 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
127} 210}
128 211
129sub size_request { 212sub size_request {
130 require Carp; 213 require Carp;
131 Carp::confess "size_request is abtract"; 214 Carp::confess "size_request is abstract";
132} 215}
133 216
134sub configure { 217sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 218 my ($self, $x, $y, $w, $h) = @_;
136 219
220 if ($self->{aspect}) {
221 my $w2 = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect};
223
224 # use alignment to adjust x, y
225
226 $x += int +($w - $w2) * 0.5;
227 $y += int +($h - $h2) * 0.5;
228
229 ($w, $h) = ($w2, $h2);
230 }
231
232 if ($self->{x} != $x || $self->{y} != $y) {
137 $self->{x} = $x; 233 $self->{x} = $x;
138 $self->{y} = $y; 234 $self->{y} = $y;
235 $self->update;
236 }
139 237
140 return unless $self->{w} != $w || $self->{h} != $h; 238 if ($self->{w} != $w || $self->{h} != $h) {
141 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
142 $self->{w} = $w; 240 }
143 $self->{h} = $h;
144
145 $self->size_allocate ($w, $h);
146} 241}
147 242
148sub size_allocate { 243sub size_allocate {
149 # nothing to be done 244 # nothing to be done
150} 245}
151 246
152# return top left coordinates 247sub children {
153sub _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 {
154 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
155 263
156 $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;
157} 266}
158 267
159# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
160sub coord2local { 269sub coord2local {
161 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
162 271
163 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
164 ($x - $X, $y - $Y)
165} 273}
166 274
167# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
168sub coord2global { 276sub coord2global {
169 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
170 278
171 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
172 ($x + $X, $y + $Y)
173} 280}
174 281
175sub focus_in { 282sub focus_in {
176 my ($self) = @_; 283 my ($self) = @_;
177 284
… …
237 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
238 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
239 glEnd; 346 glEnd;
240 glDisable GL_BLEND; 347 glDisable GL_BLEND;
241 } 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 }
242} 363}
243 364
244sub _draw { 365sub _draw {
245 my ($self) = @_; 366 my ($self) = @_;
246 367
247 warn "no draw defined for $self\n"; 368 warn "no draw defined for $self\n";
248} 369}
249 370
250sub find_widget { 371sub find_widget {
251 my ($self, $x, $y) = @_; 372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
252 375
253 return $self 376 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 379
… …
259 382
260sub set_parent { 383sub set_parent {
261 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
262 385
263 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};
264} 392}
265 393
266sub check_size { 394sub check_size {
267 my ($self) = @_; 395 my ($self, $forced) = @_;
268 396
269 my ($w, $h) = $self->size_request; 397 $self->{force_alloc} = 1 if $forced;
270 398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
281} 399}
282 400
283sub update { 401sub update {
284 my ($self) = @_; 402 my ($self) = @_;
285 403
… …
294} 412}
295 413
296sub emit { 414sub emit {
297 my ($self, $signal, @args) = @_; 415 my ($self, $signal, @args) = @_;
298 416
299 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300 $cb->($self, @args);
301 }
302} 418}
303 419
304sub DESTROY { 420sub DESTROY {
305 my ($self) = @_; 421 my ($self) = @_;
306 422
… …
312package CFClient::UI::DrawBG; 428package CFClient::UI::DrawBG;
313 429
314our @ISA = CFClient::UI::Base::; 430our @ISA = CFClient::UI::Base::;
315 431
316use strict; 432use strict;
317use SDL::OpenGL; 433use CFClient::OpenGL;
318 434
319sub new { 435sub new {
320 my $class = shift; 436 my $class = shift;
321 437
322 # range [value, low, high, page] 438 # range [value, low, high, page]
… …
351 467
352package CFClient::UI::Empty; 468package CFClient::UI::Empty;
353 469
354our @ISA = CFClient::UI::Base::; 470our @ISA = CFClient::UI::Base::;
355 471
472sub new {
473 my ($class, %arg) = @_;
474 $class->SUPER::new (can_events => 0, %arg);
475}
476
356sub size_request { 477sub size_request {
357 (0, 0) 478 (0, 0)
358} 479}
359 480
360sub draw { } 481sub draw { }
… …
368sub new { 489sub new {
369 my ($class, %arg) = @_; 490 my ($class, %arg) = @_;
370 491
371 my $children = delete $arg{children} || []; 492 my $children = delete $arg{children} || [];
372 493
373 my $self = $class->SUPER::new (children => [], %arg); 494 my $self = $class->SUPER::new (
495 children => [],
496 can_events => 0,
497 %arg,
498 );
374 $self->add ($_) for @$children; 499 $self->add ($_) for @$children;
375 500
376 $self 501 $self
377} 502}
378 503
379sub add { 504sub add {
380 my ($self, $child) = @_; 505 my ($self, @widgets) = @_;
381 506
382 $child->set_parent ($self); 507 $_->set_parent ($self)
508 for @widgets;
383 509
384 use sort 'stable'; 510 use sort 'stable';
385 511
386 $self->{children} = [ 512 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 513 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 514 @{$self->{children}}, @widgets
389 ]; 515 ];
390 516
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 517 $self->check_size (1);
518 $self->update;
519}
520
521sub children {
522 @{ $_[0]{children} }
394} 523}
395 524
396sub remove { 525sub remove {
397 my ($self, $widget) = @_; 526 my ($self, $child) = @_;
398 527
528 delete $child->{parent};
529 $child->hide;
530
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 532
401 $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;
402} 550}
403 551
404sub find_widget { 552sub find_widget {
405 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
406 554
… …
436 584
437 $class->SUPER::new (children => [$child], %arg) 585 $class->SUPER::new (children => [$child], %arg)
438} 586}
439 587
440sub add { 588sub add {
441 my ($self, $widget) = @_; 589 my ($self, $child) = @_;
442 590
443 $self->{children} = []; 591 $self->{children} = [];
444 592
445 $self->SUPER::add ($widget); 593 $self->SUPER::add ($child);
446} 594}
447 595
448sub remove { 596sub remove {
449 my ($self, $widget) = @_; 597 my ($self, $widget) = @_;
450 598
… …
470 618
471package CFClient::UI::Window; 619package CFClient::UI::Window;
472 620
473our @ISA = CFClient::UI::Bin::; 621our @ISA = CFClient::UI::Bin::;
474 622
475use SDL::OpenGL; 623use CFClient::OpenGL;
476 624
477sub new { 625sub new {
478 my ($class, %arg) = @_; 626 my ($class, %arg) = @_;
479 627
480 my $self = $class->SUPER::new (%arg); 628 my $self = $class->SUPER::new (%arg);
481} 629}
482 630
483sub update { 631sub update {
484 my ($self) = @_; 632 my ($self) = @_;
485 633
486 # we want to do this delayed... 634 $ROOT->on_post_alloc ($self => sub { $self->render_child });
487 $self->render_chld;
488 $self->SUPER::update; 635 $self->SUPER::update;
489}
490
491sub render_chld {
492 my ($self) = @_;
493
494 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
495 glClearColor 0, 0, 0, 1;
496 glClear GL_COLOR_BUFFER_BIT;
497 $self->child->draw;
498 };
499} 636}
500 637
501sub size_allocate { 638sub size_allocate {
502 my ($self, $w, $h) = @_; 639 my ($self, $w, $h) = @_;
503 640
504 $self->child->configure (0, 0, $w, $h); 641 $self->SUPER::size_allocate ($w, $h);
642 $self->update;
643}
505 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
506 $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 };
507} 665}
508 666
509sub _draw { 667sub _draw {
510 my ($self) = @_; 668 my ($self) = @_;
511 669
512 my ($w, $h) = ($self->w, $self->h); 670 my ($w, $h) = ($self->w, $self->h);
513 671
514 my $tex = $self->{texture} 672 my $tex = $self->{texture}
515 or return; 673 or return;
516 674
517 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
519 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
520 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;
521 678
522 $tex->draw_quad (0, 0, $w, $h); 679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
523 680
524 glDisable GL_BLEND;
525 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
526} 682}
527 683
528############################################################################# 684#############################################################################
529 685
530package CFClient::UI::ViewPort; 686package CFClient::UI::ViewPort;
531 687
532our @ISA = CFClient::UI::Window::; 688our @ISA = CFClient::UI::Window::;
533 689
534sub new { die }
535
536sub size_request { 690sub size_request {
537 my ($self) = @_; 691 my ($self) = @_;
538 692
539 @$self{qw(child_w child_h)} = $self->child->size_request; 693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
540 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
541 695
542 @$self{qw(child_w child_h)} 696 @$self{qw(child_w child_h)}
543} 697}
544 698
545sub _draw {
546 my ($self) = @_;
547
548 $self->{children}[1]->draw;
549}
550
551
552#############################################################################
553
554package CFClient::UI::Frame;
555
556our @ISA = CFClient::UI::Bin::;
557
558use SDL::OpenGL;
559
560sub size_request {
561 my ($self) = @_;
562 my $chld = $self->child
563 or return (0, 0);
564
565 $chld->move (2, 2);
566
567 map { $_ + 4 } $chld->size_request;
568}
569
570sub size_allocate { 699sub size_allocate {
571 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)
572 739 }
573 $self->child->configure (2, 2, $w - 4, $h - 4);
574} 740}
575 741
576sub _draw { 742sub _render {
577 my ($self) = @_; 743 my ($self) = @_;
578 744
579 my $chld = $self->child; 745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
580 746
581 my ($w, $h) = $chld->size_request; 747 $self->SUPER::_render;
582
583 glBegin GL_QUADS;
584 glColor 0, 0, 0;
585 glVertex 0 , 0;
586 glVertex 0 , $h + 4;
587 glVertex $w + 4 , $h + 4;
588 glVertex $w + 4 , 0;
589 glEnd;
590
591 $chld->draw;
592} 748}
593 749
594############################################################################# 750#############################################################################
595 751
596package CFClient::UI::FancyFrame; 752package CFClient::UI::ScrolledWindow;
597 753
598our @ISA = CFClient::UI::Bin::; 754our @ISA = CFClient::UI::HBox::;
599
600use SDL::OpenGL;
601
602my @tex =
603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
604 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605 755
606sub new { 756sub new {
607 my $class = shift; 757 my $class = shift;
608 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
609 # TODO: user_x, user_y, overwrite moveto? 808 # TODO: user_x, user_y, overwrite moveto?
610 809
611 $class->SUPER::new ( 810 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 811 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 812 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 813 border => 0.6,
814 can_events => 1,
615 @_ 815 @_
616 ) 816 );
817
818 $self->{title} &&= new CFClient::UI::Label
819 align => 0,
820 valign => 1,
821 text => $self->{title},
822 fontsize => $self->{border};
823
824 $self
825}
826
827sub border {
828 int $_[0]{border} * $::FONTSIZE
617} 829}
618 830
619sub size_request { 831sub size_request {
620 my ($self) = @_; 832 my ($self) = @_;
621 833
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624 my ($w, $h) = $self->SUPER::size_request; 834 my ($w, $h) = $self->SUPER::size_request;
625 835
626 ( 836 (
627 $w + $self->{border} * 2, 837 $w + $self->border * 2,
628 $h + $self->{border} * 2, 838 $h + $self->border * 2,
629 ) 839 )
630} 840}
631 841
632sub size_allocate { 842sub size_allocate {
633 my ($self, $w, $h) = @_; 843 my ($self, $w, $h) = @_;
634 844
635 $h -= List::Util::max 0, $self->{border} * 2; 845 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 846 $w -= List::Util::max 0, $self->border * 2;
637 847
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
849 if $self->{title};
850
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 851 $self->child->configure ($self->border, $self->border, $w, $h);
639} 852}
640 853
641sub button_down { 854sub button_down {
642 my ($self, $ev, $x, $y) = @_; 855 my ($self, $ev, $x, $y) = @_;
643 856
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 857 my ($w, $h) = @$self{qw(w h)};
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 858 my $border = $self->border;
646 859
860 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
861 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
862
863 if ($lr & $td) {
864 my ($wx, $wy) = ($self->{x}, $self->{y});
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 865 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 866 my ($bw, $bh) = ($self->{w}, $self->{h});
867
868 my $mx = $x < $border;
869 my $my = $y < $border;
649 870
650 $self->{motion} = sub { 871 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 872 my ($ev, $x, $y) = @_;
652 873
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 874 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy;
654 876
655 $self->{user_w} = $bw + $x - $ox; 877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
656 $self->{user_h} = $bh + $y - $oy; 878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
657 $self->check_size; 880 $self->check_size;
658 }; 881 };
659 882
660 } elsif ($x >= 0 && $x < $self->{w} 883 } elsif ($lr ^ $td) {
661 && $y >= 0 && $y < $self->{border}) {
662
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 884 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 885 my ($bx, $by) = ($self->{x}, $self->{y});
665 886
666 $self->{motion} = sub { 887 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 888 my ($ev, $x, $y) = @_;
668 889
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 890 ($x, $y) = ($ev->{x}, $ev->{y});
670 891
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 892 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 893 $self->update;
673 }; 894 };
674 } 895 }
… …
690 my ($self) = @_; 911 my ($self) = @_;
691 912
692 my ($w, $h ) = ($self->{w}, $self->{h}); 913 my ($w, $h ) = ($self->{w}, $self->{h});
693 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
694 915
695 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 916 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 918
919 my $border = $self->border;
920
700 glColor @{ $self->{border_bg} }; 921 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 922 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
705 926
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
706 my $bg = $tex[0]; 928 my $bg = $tex[0];
707 929
708 # TODO: repeat texture not scale 930 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 931 my $rep_x = $cw / $bg->{w};
710 my $rep_y = $ch / $bg->{h}; 932 my $rep_y = $ch / $bg->{h};
711 933
712 glColor @{ $self->{bg} }; 934 glColor @{ $self->{bg} };
713 935
714 $bg->{s} = $rep_x; 936 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 937 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 938 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 939 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 }
718 941
719 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 943
944 $self->{title}->draw if $self->{title};
721 945
722 $self->child->draw; 946 $self->child->draw;
723} 947}
724 948
725############################################################################# 949#############################################################################
… …
728 952
729our @ISA = CFClient::UI::Base::; 953our @ISA = CFClient::UI::Base::;
730 954
731use List::Util qw(max sum); 955use List::Util qw(max sum);
732 956
733use SDL::OpenGL; 957use CFClient::OpenGL;
734 958
735sub new { 959sub new {
736 my $class = shift; 960 my $class = shift;
737 961
738 $class->SUPER::new ( 962 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 969 my ($self, $x, $y, $child) = @_;
746 970
747 $child->set_parent ($self); 971 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 972 $self->{children}[$y][$x] = $child;
749 973
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 974 $child->check_size;
975}
976
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
753} 979}
754 980
755# 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?
756sub clear { 982sub clear {
757 my ($self) = @_; 983 my ($self) = @_;
758 984
985 my @children = $self->children;
759 delete $self->{children}; 986 delete $self->{children};
987
988 for (@children) {
989 delete $_->{parent};
990 $_->hide;
991 }
992
760 $self->update; 993 $self->update;
761} 994}
762 995
763sub get_wh { 996sub get_wh {
764 my ($self) = @_; 997 my ($self) = @_;
… …
770 or next; 1003 or next;
771 1004
772 for my $x (0 .. $#$row) { 1005 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 1006 my $widget = $row->[$x]
774 or next; 1007 or next;
775 my ($w, $h) = $widget->size_request; 1008 my ($w, $h) = @$widget{qw(req_w req_h)};
776 1009
777 $w[$x] = max $w[$x], $w; 1010 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 1011 $h[$y] = max $h[$y], $h;
779 } 1012 }
780 } 1013 }
… …
885 1118
886 ($h, $w) = ($w, $h); 1119 ($h, $w) = ($w, $h);
887 1120
888 my $children = $self->{children}; 1121 my $children = $self->{children};
889 1122
890 my @h = map +($_->size_request)[0], @$children; 1123 my @h = map $_->{req_w}, @$children;
891 1124
892 my $req_h = List::Util::sum @h; 1125 my $req_h = List::Util::sum @h;
893 1126
894 if ($req_h > $h) { 1127 if ($req_h > $h) {
895 # ah well, not enough space 1128 # ah well, not enough space
… …
941} 1174}
942 1175
943sub size_allocate { 1176sub size_allocate {
944 my ($self, $w, $h) = @_; 1177 my ($self, $w, $h) = @_;
945 1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
946 my $children = $self->{children}; 1181 my $children = $self->{children};
947 1182
948 my @h = map +($_->size_request)[1], @$children; 1183 my @h = map $_->{req_h}, @$children;
949 1184
950 my $req_h = List::Util::sum @h; 1185 my $req_h = List::Util::sum @h;
951 1186
952 if ($req_h > $h) { 1187 if ($req_h > $h) {
953 # ah well, not enough space 1188 # ah well, not enough space
… …
981 1216
982package CFClient::UI::Label; 1217package CFClient::UI::Label;
983 1218
984our @ISA = CFClient::UI::Base::; 1219our @ISA = CFClient::UI::Base::;
985 1220
986use SDL::OpenGL; 1221use CFClient::OpenGL;
987 1222
988sub new { 1223sub new {
989 my ($class, %arg) = @_; 1224 my ($class, %arg) = @_;
990 1225
991 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1227 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1228 #font => default_font
994 text => "", 1229 #text => initial text
1230 #markup => initial narkup
1231 layout => (new CFClient::Layout),
1232 fontsize => 1,
995 align => -1, 1233 align => -1,
996 valign => -1, 1234 valign => -1,
997 padding => 2, 1235 padding => 2,
998 layout => new CFClient::Layout, 1236 can_events => 0,
999 %arg 1237 %arg
1000 ); 1238 );
1001 1239
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1240 if (exists $self->{template}) {
1241 my $layout = new CFClient::Layout;
1242 $layout->set_text (delete $self->{template});
1243 $self->{template} = $layout;
1244 }
1003 1245
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1246 if (exists $self->{markup}) {
1005 $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 }
1006 1251
1007 $self 1252 $self
1008} 1253}
1009 1254
1010sub escape_text { 1255sub escape {
1011 local $_ = $_[1]; 1256 local $_ = $_[1];
1012 1257
1013 s/&/&amp;/g; 1258 s/&/&amp;/g;
1014 s/>/&gt;/g; 1259 s/>/&gt;/g;
1015 s/</&lt;/g; 1260 s/</&lt;/g;
1016 1261
1017 $_[1] 1262 $_[1]
1018} 1263}
1019 1264
1265sub update {
1266 my ($self) = @_;
1267
1268 delete $self->{texture};
1269 $self->SUPER::update;
1270}
1271
1020sub set_text { 1272sub set_text {
1021 my ($self, $text) = @_; 1273 my ($self, $text) = @_;
1022 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;
1023 $self->{layout}->set_text ($text); 1279 $self->{layout}->set_text ($text);
1024 1280
1025 delete $self->{texture};
1026 $self->update; 1281 $self->update;
1282 $self->check_size;
1027} 1283}
1028 1284
1029sub set_markup { 1285sub set_markup {
1030 my ($self, $markup) = @_; 1286 my ($self, $markup) = @_;
1031 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;
1032 $self->{layout}->set_markup ($markup); 1294 $self->{layout}->set_markup ($markup);
1033 1295
1034 delete $self->{texture};
1035 $self->update; 1296 $self->update;
1297 $self->check_size;
1036} 1298}
1037 1299
1038sub size_request { 1300sub size_request {
1039 my ($self) = @_; 1301 my ($self) = @_;
1040 1302
1041 $self->{layout}->set_width; 1303 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1);
1042 $self->{layout}->set_height ($self->{fontsize}); 1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1306
1044 my ($w, $h) = $self->{layout}->size; 1307 my ($w, $h) = $self->{layout}->size;
1308
1309 if (exists $self->{template}) {
1310 $self->{template}->set_font ($self->{font}) if $self->{font};
1311 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1312
1313 my ($w2, $h2) = $self->{template}->size;
1314
1315 $w = List::Util::max $w, $w2;
1316 $h = List::Util::max $h, $h2;
1317 }
1045 1318
1046 ( 1319 (
1047 $w + $self->{padding} * 2, 1320 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1321 $h + $self->{padding} * 2,
1049 ) 1322 )
… …
1053 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1054 1327
1055 delete $self->{texture}; 1328 delete $self->{texture};
1056} 1329}
1057 1330
1058sub update { 1331sub set_fontsize {
1059 my ($self) = @_; 1332 my ($self, $fontsize) = @_;
1060 1333
1334 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1335 delete $self->{texture};
1336
1062 $self->SUPER::update; 1337 $self->update;
1338 $self->check_size;
1063} 1339}
1064 1340
1065sub _draw { 1341sub _draw {
1066 my ($self) = @_; 1342 my ($self) = @_;
1067 1343
1068 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};
1069 $self->{layout}->set_width ($self->{w}); 1347 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1349
1071 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
1072 }; 1361 };
1073 1362
1074 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1076 glEnable GL_TEXTURE_2D; 1363 glEnable GL_TEXTURE_2D;
1077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1078 1365
1366 if ($tex->{format} == GL_ALPHA) {
1079 glColor @{$self->{fg}}; 1367 glColor @{$self->{fg}};
1080
1081 $self->{ox} = int (
1082 $self->{align} < 0 ? $self->{padding}
1083 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1084 : ($self->{w} - $tex->{w}) * 0.5
1085 );
1086
1087 $self->{oy} = int (
1088 $self->{valign} < 0 ? $self->{padding}
1089 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1090 : ($self->{h} - $tex->{h}) * 0.5
1091 );
1092
1093 $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 }
1094 1372
1095 glDisable GL_TEXTURE_2D; 1373 glDisable GL_TEXTURE_2D;
1096 glDisable GL_BLEND;
1097} 1374}
1098 1375
1099############################################################################# 1376#############################################################################
1100 1377
1101package CFClient::UI::EntryBase; 1378package CFClient::UI::EntryBase;
1102 1379
1103our @ISA = CFClient::UI::Label::; 1380our @ISA = CFClient::UI::Label::;
1104 1381
1105use SDL; 1382use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1383
1108sub new { 1384sub new {
1109 my $class = shift; 1385 my $class = shift;
1110 1386
1111 $class->SUPER::new ( 1387 $class->SUPER::new (
1112 fg => [1, 1, 1], 1388 fg => [1, 1, 1],
1113 bg => [0, 0, 0, 0.2], 1389 bg => [0, 0, 0, 0.2],
1114 active_bg => [1, 1, 1, 0.5], 1390 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1391 active_fg => [0, 0, 0],
1116 can_hover => 1, 1392 can_hover => 1,
1117 can_focus => 1, 1393 can_focus => 1,
1118 valign => 0, 1394 valign => 0,
1395 can_events => 1,
1119 @_ 1396 @_
1120 ) 1397 )
1121} 1398}
1122 1399
1123sub _set_text { 1400sub _set_text {
… …
1125 1402
1126 delete $self->{cur_h}; 1403 delete $self->{cur_h};
1127 1404
1128 return if $self->{text} eq $text; 1405 return if $self->{text} eq $text;
1129 1406
1407 delete $self->{texture};
1408
1130 $self->{last_activity} = $::NOW; 1409 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1410 $self->{text} = $text;
1132 1411
1133 $text =~ s/./*/g if $self->{hidden}; 1412 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1413 $self->{layout}->set_text ("$text ");
1135 1414
1136 $self->emit (changed => $self->{text}); 1415 $self->emit (changed => $self->{text});
1137} 1416}
1138 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
1139sub get_text { 1427sub get_text {
1140 $_[0]{text} 1428 $_[0]{text}
1141} 1429}
1142 1430
1143sub size_request { 1431sub size_request {
… …
1149} 1437}
1150 1438
1151sub size_allocate { 1439sub size_allocate {
1152 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1153 1441
1154 $self->_set_text ($self->{text}); 1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155}
1156
1157sub set_text {
1158 my ($self, $text) = @_;
1159
1160 $self->{cursor} = length $text;
1161 $self->_set_text ($text);
1162 $self->update;
1163} 1443}
1164 1444
1165sub key_down { 1445sub key_down {
1166 my ($self, $ev) = @_; 1446 my ($self, $ev) = @_;
1167 1447
1168 my $mod = $ev->key_mod; 1448 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1449 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1450 my $uni = $ev->{unicode};
1172 1451
1173 my $text = $self->get_text; 1452 my $text = $self->get_text;
1174 1453
1175 if ($sym == SDLK_BACKSPACE) { 1454 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1456 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1457 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1458 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1459 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1460 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1461 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1462 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1463 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1464 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1465 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1466 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1467 $self->emit ('escape');
1189 } elsif ($uni) { 1468 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1469 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1470 }
1192 1471
… …
1267 1546
1268package CFClient::UI::Entry; 1547package CFClient::UI::Entry;
1269 1548
1270our @ISA = CFClient::UI::EntryBase::; 1549our @ISA = CFClient::UI::EntryBase::;
1271 1550
1272use SDL; 1551use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1552
1275sub key_down { 1553sub key_down {
1276 my ($self, $ev) = @_; 1554 my ($self, $ev) = @_;
1277 1555
1278 my $sym = $ev->key_sym; 1556 my $sym = $ev->{sym};
1279 1557
1280 if ($sym == SDLK_RETURN) { 1558 if ($sym == 13) {
1559 unshift @{$self->{history}},
1560 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = '';
1281 $self->emit (activate => $self->get_text); 1563 $self->emit (activate => $txt);
1282 $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 }
1283 1587
1284 } else { 1588 } else {
1285 $self->SUPER::key_down ($ev); 1589 $self->SUPER::key_down ($ev);
1286 } 1590 }
1287 1591
… …
1291 1595
1292package CFClient::UI::Button; 1596package CFClient::UI::Button;
1293 1597
1294our @ISA = CFClient::UI::Label::; 1598our @ISA = CFClient::UI::Label::;
1295 1599
1296use SDL; 1600use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1601
1299my @tex = 1602my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1604 qw(b1_button_active.png);
1302 1605
1303sub new { 1606sub new {
1304 my $class = shift; 1607 my $class = shift;
1305 1608
1306 $class->SUPER::new ( 1609 $class->SUPER::new (
1307 padding => 4, 1610 padding => 4,
1308 fg => [1, 1, 1], 1611 fg => [1, 1, 1],
1309 bg => [1, 1, 1, 0.2], 1612 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1613 active_fg => [0, 0, 1],
1311 can_hover => 1, 1614 can_hover => 1,
1312 align => 0, 1615 align => 0,
1313 valign => 0, 1616 valign => 0,
1617 can_events => 1,
1314 @_ 1618 @_
1315 ) 1619 )
1316} 1620}
1317 1621
1318sub button_up { 1622sub button_up {
… …
1331 1635
1332 if ($GRAB == $self) { 1636 if ($GRAB == $self) {
1333 $self->{fg} = $self->{active_fg}; 1637 $self->{fg} = $self->{active_fg};
1334 } 1638 }
1335 1639
1336 glEnable GL_BLEND;
1337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1338 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1339 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1340 glColor 0, 0, 0, 1; 1642 glColor 0, 0, 0, 1;
1341 1643
1342 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1644 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1343 1645
1344 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1345 glDisable GL_BLEND;
1346 1647
1347 $self->SUPER::_draw; 1648 $self->SUPER::_draw;
1348} 1649}
1349 1650
1350############################################################################# 1651#############################################################################
… …
1352package CFClient::UI::CheckBox; 1653package CFClient::UI::CheckBox;
1353 1654
1354our @ISA = CFClient::UI::DrawBG::; 1655our @ISA = CFClient::UI::DrawBG::;
1355 1656
1356my @tex = 1657my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1658 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1659 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1660
1360use SDL; 1661use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1662
1363sub new { 1663sub new {
1364 my $class = shift; 1664 my $class = shift;
1365 1665
1366 $class->SUPER::new ( 1666 $class->SUPER::new (
… …
1398 1698
1399 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;
1400 1700
1401 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1402 1702
1403 glEnable GL_BLEND; 1703 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704
1404 glEnable GL_TEXTURE_2D; 1705 glEnable GL_TEXTURE_2D;
1405 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1406
1407 my $tex = $self->{state} ? $tex[1] : $tex[0];
1408
1409 $tex->draw_quad (0, 0, $s, $s); 1706 $tex->draw_quad_alpha (0, 0, $s, $s);
1410
1411 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
1412 glDisable GL_BLEND; 1765 glDisable GL_TEXTURE_2D;
1413} 1766}
1414 1767
1415############################################################################# 1768#############################################################################
1416 1769
1417package CFClient::UI::VGauge; 1770package CFClient::UI::VGauge;
1418 1771
1419our @ISA = CFClient::UI::Base::; 1772our @ISA = CFClient::UI::Base::;
1420 1773
1421use SDL::OpenGL; 1774use List::Util qw(min max);
1775
1776use CFClient::OpenGL;
1422 1777
1423my %tex = ( 1778my %tex = (
1424 food => [ 1779 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1780 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1781 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ], 1782 ],
1428 grace => [ 1783 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1784 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1430 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/
1431 ], 1786 ],
1432 hp => [ 1787 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1788 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1789 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ], 1790 ],
1436 mana => [ 1791 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1792 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1438 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/
1439 ], 1794 ],
1440); 1795);
1441 1796
1442# eg. VGauge->new (gauge => 'food'), default gauge: food 1797# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1798sub new {
1444 my $class = shift; 1799 my $class = shift;
1445 1800
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1801 my $self = $class->SUPER::new (
1802 type => 'food',
1803 @_
1804 );
1805
1806 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1447 1807
1448 $self 1808 $self
1449} 1809}
1450 1810
1451sub size_request { 1811sub size_request {
1452 my ($self) = @_; 1812 my ($self) = @_;
1453 1813
1454 my $tex = $tex{$self->{gauge}}[0]; 1814 #my $tex = $tex{$self->{type}}[0];
1455
1456 @$tex{qw(w h)} 1815 #@$tex{qw(w h)}
1816 (0, 0)
1457} 1817}
1458 1818
1459sub set_max { 1819sub set_max {
1460 my ($self, $max) = @_; 1820 my ($self, $max) = @_;
1461 1821
1822 return if $self->{max_val} == $max;
1823
1462 $self->{max_val} = $max; 1824 $self->{max_val} = $max;
1825 $self->update;
1463} 1826}
1464 1827
1465sub set_value { 1828sub set_value {
1466 my ($self, $val, $max) = @_; 1829 my ($self, $val, $max) = @_;
1467 1830
1468 $self->set_max ($max) 1831 $self->set_max ($max)
1469 if defined $max; 1832 if defined $max;
1470 1833
1471 $max = $self->{max_val}; 1834 return if $self->{val} == $val;
1835
1472 $self->{val} = $val; 1836 $self->{val} = $val;
1473
1474 $self->update; 1837 $self->update;
1475} 1838}
1476 1839
1477sub _draw { 1840sub _draw {
1478 my ($self) = @_; 1841 my ($self) = @_;
1479 1842
1480 my $tex = $tex{$self->{gauge}}; 1843 my $tex = $tex{$self->{type}};
1844 my ($t1, $t2, $t3) = @$tex;
1481 1845
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1846 my ($w, $h) = ($self->{w}, $self->{h});
1483 1847
1848 if ($self->{vertical}) {
1849 glRotate 90, 0, 0, 1;
1850 glTranslate 0, -$self->{w}, 0;
1851
1852 ($w, $h) = ($h, $w);
1853 }
1854
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1855 my $ycut = $self->{val} / ($self->{max_val} || 1);
1485 $ycut = 1 if $self->{val} > $self->{max_val};
1486 1856
1487 my $t1 = $tex->[0]; 1857 my $ycut1 = max 0, min 1, $ycut;
1488 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);
1489 1862
1490 glEnable GL_BLEND; 1863 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1864 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1865 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1867
1495 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h};
1497
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1868 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1869 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1870 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1871 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1872 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1873 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1874 glEnd;
1507 1875
1508 $yp += $h1; 1876 my $ycut1 = List::Util::min 1, $ycut;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1877 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1878 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1879 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1880 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1881 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1882 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516 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 }
1517 1894
1518 glDisable GL_BLEND; 1895 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1520} 1897}
1521 1898
1522############################################################################# 1899#############################################################################
1523 1900
1901package CFClient::UI::Gauge;
1902
1903our @ISA = CFClient::UI::VBox::;
1904
1905sub new {
1906 my ($class, %arg) = @_;
1907
1908 my $self = $class->SUPER::new (
1909 tooltip => $arg{type},
1910 can_hover => 1,
1911 can_events => 1,
1912 %arg,
1913 );
1914
1915 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1916 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1917 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1918
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);
1934}
1935
1936sub set_value {
1937 my ($self, $val, $max) = @_;
1938
1939 $self->set_max ($max)
1940 if defined $max;
1941
1942 $self->{gauge}->set_value ($val, $max);
1943 $self->{value}->set_text ($val);
1944}
1945
1946#############################################################################
1947
1524package CFClient::UI::Slider; 1948package CFClient::UI::Slider;
1525 1949
1526use strict; 1950use strict;
1527 1951
1528use SDL::OpenGL; 1952use CFClient::OpenGL;
1529 1953
1530our @ISA = CFClient::UI::DrawBG::; 1954our @ISA = CFClient::UI::DrawBG::;
1531 1955
1532my @tex = 1956my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1967 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1968 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1969 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1970 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1971 range => [0, 0, 100, 10],
1548 req_w => 40, 1972 req_w => $::WIDTH / 80,
1549 req_h => 13, 1973 req_h => $::WIDTH / 80,
1550 vertical => 0, 1974 vertical => 0,
1551 can_hover => 1, 1975 can_hover => 1,
1552 inner_pad => 5, 1976 inner_pad => 5,
1553 @_ 1977 @_
1554 ); 1978 );
… …
1637 $page ||= 2; 2061 $page ||= 2;
1638 2062
1639 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1640 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1641 2065
1642 glEnable GL_BLEND;
1643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1644 glEnable GL_TEXTURE_2D; 2066 glEnable GL_TEXTURE_2D;
1645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1646 2068
1647 # draw background 2069 # draw background
1648 $tex[1]->draw_quad (0, 0, $w, $h); 2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1649 2071
1650 # draw handle 2072 # draw handle
1651 $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);
1652 2074
1653 glDisable GL_BLEND;
1654 glDisable GL_TEXTURE_2D; 2075 glDisable GL_TEXTURE_2D;
1655} 2076}
1656 2077
1657############################################################################# 2078#############################################################################
1658 2079
1659package CFClient::UI::TextView; 2080package CFClient::UI::TextView;
1660 2081
1661our @ISA = CFClient::UI::HBox::; 2082our @ISA = CFClient::UI::HBox::;
1662 2083
1663use SDL::OpenGL; 2084use CFClient::OpenGL;
1664 2085
1665sub new { 2086sub new {
1666 my $class = shift; 2087 my $class = shift;
1667 2088
1668 my $self = $class->SUPER::new ( 2089 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6, 2090 fontsize => 1,
1670 req_h => $::HEIGHT / 6, 2091 can_events => 0,
1671 fontsize => $::FONTSIZE, 2092 #font => default_font
1672 @_, 2093 @_,
1673 2094
1674 layout => (new CFClient::Layout), 2095 layout => (new CFClient::Layout 1),
1675 par => [], 2096 par => [],
1676 height => 0, 2097 height => 0,
1677 children => [ 2098 children => [
1678 (new CFClient::UI::Empty expand => 1), 2099 (new CFClient::UI::Empty expand => 1),
1679 (new CFClient::UI::Slider vertical => 1), 2100 (new CFClient::UI::Slider vertical => 1),
1680 ], 2101 ],
1681 ); 2102 );
1682 2103
1683 $self->{children}[1]->connect (changed => sub { 2104 $self->{children}[1]->connect (changed => sub { $self->update });
1684 $self->update;
1685 });
1686 2105
1687 $self 2106 $self
1688} 2107}
1689 2108
1690sub set_fontsize { 2109sub set_fontsize {
… …
1697sub text_height { 2116sub text_height {
1698 my ($self, $text) = @_; 2117 my ($self, $text) = @_;
1699 2118
1700 my $layout = $self->{layout}; 2119 my $layout = $self->{layout};
1701 2120
1702 $layout->set_height ($self->{fontsize}); 2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 2122 $layout->set_width ($self->{children}[0]{w});
1704 $layout->set_text ($text); 2123 $layout->set_markup ($text);
1705 2124
1706 ($layout->size)[1] 2125 ($layout->size)[1]
1707} 2126}
1708 2127
1709sub reflow { 2128sub reflow {
… …
1711 2130
1712 $self->{need_reflow}++; 2131 $self->{need_reflow}++;
1713 $self->update; 2132 $self->update;
1714} 2133}
1715 2134
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 2135sub size_allocate {
1723 my ($self, $w, $h) = @_; 2136 my ($self, $w, $h) = @_;
1724 2137
2138 $self->SUPER::size_allocate ($w, $h);
2139
2140 $self->{layout}->set_font ($self->{font}) if $self->{font};
1725 $self->{layout}->set_height ($self->{fontsize}); 2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 2142 $self->{layout}->set_width ($self->{children}[0]{w});
1727 2143
1728 $self->reflow; 2144 $self->reflow;
1729 $self->update;
1730} 2145}
1731 2146
1732sub add_paragraph { 2147sub add_paragraph {
1733 my ($self, $color, $text) = @_; 2148 my ($self, $color, $text) = @_;
1734 2149
… …
1751 2166
1752 return unless $self->{h} > 0; 2167 return unless $self->{h} > 0;
1753 2168
1754 delete $self->{texture}; 2169 delete $self->{texture};
1755 2170
1756 $ROOT->on_refresh ($self, sub { 2171 $ROOT->on_post_alloc ($self, sub {
1757 if (delete $self->{need_reflow}) { 2172 if (delete $self->{need_reflow}) {
1758 my $height = 0; 2173 my $height = 0;
1759 2174
1760 $height += $_->[0] = $self->text_height ($_->[2]) 2175 $height += $_->[0] = $self->text_height ($_->[2])
1761 for @{$self->{par}}; 2176 for @{$self->{par}};
… …
1765 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1766 2181
1767 delete $self->{texture}; 2182 delete $self->{texture};
1768 } 2183 }
1769 2184
1770 $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 {
1771 glClearColor 0, 0, 0, 1; 2186 glClearColor 0, 0, 0, 0;
1772 glClear GL_COLOR_BUFFER_BIT; 2187 glClear GL_COLOR_BUFFER_BIT;
1773 2188
1774 glEnable GL_BLEND;
1775 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1776 glEnable GL_TEXTURE_2D; 2189 glEnable GL_TEXTURE_2D;
1777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1778 2191
1779 my $top = int $self->{children}[1]{range}[0]; 2192 my $top = int $self->{children}[1]{range}[0];
1780 2193
… …
1783 2196
1784 my $y = 0; 2197 my $y = 0;
1785 2198
1786 my $layout = $self->{layout}; 2199 my $layout = $self->{layout};
1787 2200
2201 $layout->set_font ($self->{font}) if $self->{font};
2202
1788 for my $par (@{$self->{par}}) { 2203 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2204 my $h = $par->[0];
1790 2205
1791 if ($y0 < $y + $h && $y < $y1) { 2206 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] });
1792 $layout->set_text ($par->[2]); 2208 $layout->set_markup ($par->[2]);
1793 2209
1794 glColor @{ $par->[1] };
1795 my ($W, $H) = $layout->size; 2210 my ($W, $H) = $layout->size;
1796 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);
1797 } 2212 }
1798 2213
1799 $y += $h; 2214 $y += $h;
1800 } 2215 }
1801 2216
1802 glDisable GL_TEXTURE_2D; 2217 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804 }; 2218 };
1805 }); 2219 });
1806} 2220}
1807 2221
1808sub _draw { 2222sub _draw {
1809 my ($self) = @_; 2223 my ($self) = @_;
1810 2224
1811 if ($self->{texture}) {
1812 glEnable GL_TEXTURE_2D; 2225 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814 $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});
1815 glDisable GL_TEXTURE_2D; 2229 glDisable GL_TEXTURE_2D;
1816 }
1817 2230
1818 $self->{children}[1]->draw; 2231 $self->{children}[1]->draw;
1819 2232
1820} 2233}
1821 2234
1822############################################################################# 2235#############################################################################
1823 2236
1824package CFClient::UI::MapWidget;
1825
1826use strict;
1827
1828use List::Util qw(min max);
1829
1830use SDL;
1831use SDL::OpenGL;
1832
1833our @ISA = CFClient::UI::Base::;
1834
1835sub new {
1836 my $class = shift;
1837
1838 $class->SUPER::new (
1839 z => -1,
1840 can_focus => 1,
1841 list => (glGenLists 1),
1842 @_
1843 )
1844}
1845
1846sub key_down {
1847 print "MAPKEYDOWN\n";
1848}
1849
1850sub key_up {
1851}
1852
1853sub button_down {
1854 my ($self, $ev, $x, $y) = @_;
1855
1856 $self->focus_in;
1857
1858 if ($ev->button == 2) {
1859 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862 $self->{motion} = sub {
1863 my ($ev, $x, $y) = @_;
1864
1865 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867 $::CFG->{map_shift_x} = $bw + $x - $ox;
1868 $::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870 $self->update;
1871 };
1872 }
1873}
1874
1875sub button_up {
1876 my ($self, $ev, $x, $y) = @_;
1877
1878 delete $self->{motion};
1879}
1880
1881sub mouse_motion {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 $self->{motion}->($ev, $x, $y) if $self->{motion};
1885}
1886
1887sub size_request {
1888 (
1889 1 + 32 * int $::WIDTH / 32,
1890 1 + 32 * int $::HEIGHT / 32,
1891 )
1892}
1893
1894sub update {
1895 my ($self) = @_;
1896
1897 $self->{need_update} = 1;
1898 $self->SUPER::update;
1899}
1900
1901sub draw {
1902 my ($self) = @_;
1903
1904 if (delete $self->{need_update}) {
1905 glNewList $self->{list}, GL_COMPILE;
1906
1907 if ($::MAP) {
1908 my $sw = int $::WIDTH / 32;
1909 my $sh = int $::HEIGHT / 32;
1910
1911 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918 if ($::CFG->{fow_enable}) {
1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921 glConvolutionFilter2D (
1922 GL_CONVOLUTION_2D,
1923 GL_ALPHA,
1924 3, 3,
1925 GL_ALPHA, GL_FLOAT,
1926 pack "f*",
1927 0.1, 0.1, 0.1,
1928 0.1, 0.2, 0.1,
1929 0.1, 0.1, 0.1,
1930 );
1931 glEnable GL_CONVOLUTION_2D;
1932 }
1933
1934 $self->{fow_texture} = new CFClient::Texture
1935 w => $w,
1936 h => $h,
1937 data => $data,
1938 internalformat => GL_ALPHA,
1939 format => GL_ALPHA;
1940
1941 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943 glEnable GL_BLEND;
1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945 glEnable GL_TEXTURE_2D;
1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951 glDisable GL_TEXTURE_2D;
1952 glDisable GL_BLEND;
1953 }
1954
1955 # HACK BEGIN
1956 {
1957 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958 my ($w, $h) = (250, 250);
1959
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965 $self->{mapmap_texture} =
1966 new CFClient::Texture
1967 w => $w,
1968 h => $h,
1969 data => $::MAP->mapmap ($w, $h),
1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1973
1974 glDisable GL_TEXTURE_2D;
1975 glDisable GL_BLEND;
1976 }
1977 # HACK END
1978 }
1979
1980 glEndList;
1981 }
1982
1983 glPushMatrix;
1984 glCallList $self->{list};
1985 glPopMatrix;
1986
1987 if ($FOCUS != $self) {
1988 glColor 64/255, 64/255, 64/255;
1989 glLogicOp GL_AND;
1990 glEnable GL_COLOR_LOGIC_OP;
1991 glBegin GL_QUADS;
1992 glVertex 0, 0;
1993 glVertex 0, $::HEIGHT;
1994 glVertex $::WIDTH, $::HEIGHT;
1995 glVertex $::WIDTH, 0;
1996 glEnd;
1997 glDisable GL_COLOR_LOGIC_OP;
1998 }
1999}
2000
2001my %DIR = (
2002 SDLK_KP8, [1, "north"],
2003 SDLK_KP9, [2, "northeast"],
2004 SDLK_KP6, [3, "east"],
2005 SDLK_KP3, [4, "southeast"],
2006 SDLK_KP2, [5, "south"],
2007 SDLK_KP1, [6, "southwest"],
2008 SDLK_KP4, [7, "west"],
2009 SDLK_KP7, [8, "northwest"],
2010
2011 SDLK_UP, [1, "north"],
2012 SDLK_RIGHT, [3, "east"],
2013 SDLK_DOWN, [5, "south"],
2014 SDLK_LEFT, [7, "west"],
2015);
2016
2017sub key_down {
2018 my ($self, $ev) = @_;
2019
2020 my $mod = $ev->key_mod;
2021 my $sym = $ev->key_sym;
2022
2023 if ($sym == SDLK_KP5) {
2024 $::CONN->user_send ("stay fire");
2025 } elsif ($sym == SDLK_a) {
2026 $::CONN->user_send ("apply");
2027 } elsif ($sym == SDLK_QUOTE) {
2028 $self->emit ('activate_console');
2029 } elsif ($sym == SDLK_SLASH) {
2030 $self->emit ('activate_console' => '/');
2031 } elsif (exists $DIR{$sym}) {
2032 if ($mod & KMOD_SHIFT) {
2033 $self->{shft}++;
2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
2035 } elsif ($mod & KMOD_CTRL) {
2036 $self->{ctrl}++;
2037 $::CONN->user_send ("run $DIR{$sym}[0]");
2038 } else {
2039 $::CONN->user_send ("$DIR{$sym}[1]");
2040 }
2041 }
2042}
2043
2044sub key_up {
2045 my ($self, $ev) = @_;
2046
2047 my $mod = $ev->key_mod;
2048 my $sym = $ev->key_sym;
2049
2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051 $::CONN->user_send ("fire_stop");
2052 }
2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054 $::CONN->user_send ("run_stop");
2055 }
2056}
2057
2058#############################################################################
2059
2060package CFClient::UI::Animator; 2237package CFClient::UI::Animator;
2061 2238
2062use SDL::OpenGL; 2239use CFClient::OpenGL;
2063 2240
2064our @ISA = CFClient::UI::Bin::; 2241our @ISA = CFClient::UI::Bin::;
2065 2242
2066sub moveto { 2243sub moveto {
2067 my ($self, $x, $y) = @_; 2244 my ($self, $x, $y) = @_;
… …
2105 2282
2106sub new { 2283sub new {
2107 my $class = shift; 2284 my $class = shift;
2108 2285
2109 my $self = $class->SUPER::new ( 2286 my $self = $class->SUPER::new (
2110 state => 0, 2287 state => 0,
2111 connect_activate => \&toggle_flopper, 2288 connect_activate => \&toggle_flopper,
2112 @_ 2289 @_
2113 ); 2290 );
2114 2291
2115 if ($self->{state}) { 2292 if ($self->{state}) {
… …
2136 $self->emit (changed => $self->{state}); 2313 $self->emit (changed => $self->{state});
2137} 2314}
2138 2315
2139############################################################################# 2316#############################################################################
2140 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
2141package CFClient::UI::Root; 2697package CFClient::UI::Root;
2142 2698
2143our @ISA = CFClient::UI::Container::; 2699our @ISA = CFClient::UI::Container::;
2144 2700
2145use SDL::OpenGL; 2701use CFClient::OpenGL;
2146 2702
2147sub check_size { 2703sub new {
2148 my ($self) = @_; 2704 my $class = shift;
2149 2705
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2706 $class->SUPER::new (
2151} 2707 @_,
2152 2708 )
2153sub size_request {
2154 ($::WIDTH, $::HEIGHT)
2155} 2709}
2156 2710
2157sub configure { 2711sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2712 my ($self, $x, $y, $w, $h) = @_;
2159 2713
2160 $self->SUPER::configure ($x, $y, $w, $h); 2714 $self->{w} = $w;
2161 2715 $self->{h} = $h;
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}};
2164} 2716}
2165 2717
2166sub _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 {
2167 my ($self, $x, $y) = @_; 2763 my ($self, $x, $y) = @_;
2168 2764
2169 ($x, $y) 2765 ($x, $y)
2170} 2766}
2171 2767
2768sub coord2global {
2769 my ($self, $x, $y) = @_;
2770
2771 ($x, $y)
2772}
2773
2172sub update { 2774sub update {
2173 my ($self) = @_; 2775 my ($self) = @_;
2174 2776
2175 $self->check_size; 2777 $self->check_size;
2176 ::refresh (); 2778 $::WANT_REFRESH++;
2177} 2779}
2178 2780
2179sub add { 2781sub add {
2180 my ($self, $child) = @_; 2782 my ($self, $child) = @_;
2181 2783
2784 # integerise window positions
2785 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y};
2787
2182 $self->SUPER::add ($child); 2788 $self->SUPER::add ($child);
2183} 2789}
2184 2790
2185sub on_refresh { 2791sub on_refresh {
2186 my ($self, $id, $cb) = @_; 2792 my ($self, $id, $cb) = @_;
2187 2793
2188 $self->{refresh_hook}{$id} = $cb; 2794 $self->{refresh_hook}{$id} = $cb;
2189} 2795}
2190 2796
2797sub on_post_alloc {
2798 my ($self, $id, $cb) = @_;
2799
2800 $self->{post_alloc_hook}{$id} = $cb;
2801}
2802
2191sub draw { 2803sub draw {
2192 my ($self) = @_; 2804 my ($self) = @_;
2193 2805
2194 while (my $rcb = delete $self->{refresh_hook}) { 2806 while ($self->{refresh_hook}) {
2195 $_->() 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}};
2196 } 2859 }
2197 2860
2198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2861 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2200 glClear GL_COLOR_BUFFER_BIT; 2863 glClear GL_COLOR_BUFFER_BIT;
… …
2211############################################################################# 2874#############################################################################
2212 2875
2213package CFClient::UI; 2876package CFClient::UI;
2214 2877
2215$ROOT = new CFClient::UI::Root; 2878$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip;
2216 2880
22171 28811
2218 2882

Diff Legend

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