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.201 by root, Sat May 13 23:17:49 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 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
264} 391}
265 392
266sub check_size { 393sub check_size {
267 my ($self) = @_; 394 my ($self, $forced) = @_;
268 395
269 my ($w, $h) = $self->size_request; 396 $self->{force_alloc} = 1 if $forced;
270 397 $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} 398}
282 399
283sub update { 400sub update {
284 my ($self) = @_; 401 my ($self) = @_;
285 402
… …
294} 411}
295 412
296sub emit { 413sub emit {
297 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
298 415
299 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300 $cb->($self, @args);
301 }
302} 417}
303 418
304sub DESTROY { 419sub DESTROY {
305 my ($self) = @_; 420 my ($self) = @_;
306 421
… …
312package CFClient::UI::DrawBG; 427package CFClient::UI::DrawBG;
313 428
314our @ISA = CFClient::UI::Base::; 429our @ISA = CFClient::UI::Base::;
315 430
316use strict; 431use strict;
317use SDL::OpenGL; 432use CFClient::OpenGL;
318 433
319sub new { 434sub new {
320 my $class = shift; 435 my $class = shift;
321 436
322 # range [value, low, high, page] 437 # range [value, low, high, page]
… …
351 466
352package CFClient::UI::Empty; 467package CFClient::UI::Empty;
353 468
354our @ISA = CFClient::UI::Base::; 469our @ISA = CFClient::UI::Base::;
355 470
471sub new {
472 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg);
474}
475
356sub size_request { 476sub size_request {
357 (0, 0) 477 (0, 0)
358} 478}
359 479
360sub draw { } 480sub draw { }
… …
368sub new { 488sub new {
369 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
370 490
371 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
372 492
373 my $self = $class->SUPER::new (children => [], %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
374 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
375 499
376 $self 500 $self
377} 501}
378 502
379sub add { 503sub add {
380 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
381 505
382 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
383 508
384 use sort 'stable'; 509 use sort 'stable';
385 510
386 $self->{children} = [ 511 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
389 ]; 514 ];
390 515
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
394} 522}
395 523
396sub remove { 524sub remove {
397 my ($self, $widget) = @_; 525 my ($self, $child) = @_;
398 526
527 delete $child->{parent};
528 $child->hide;
529
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 531
401 $self->check_size; 532 $self->check_size;
533 $self->update;
534}
535
536sub clear {
537 my ($self) = @_;
538
539 my $children = delete $self->{children};
540 $self->{children} = [];
541
542 for (@$children) {
543 delete $_->{parent};
544 $_->hide;
545 }
546
547 $self->check_size;
548 $self->update;
402} 549}
403 550
404sub find_widget { 551sub find_widget {
405 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
406 553
… …
436 583
437 $class->SUPER::new (children => [$child], %arg) 584 $class->SUPER::new (children => [$child], %arg)
438} 585}
439 586
440sub add { 587sub add {
441 my ($self, $widget) = @_; 588 my ($self, $child) = @_;
442 589
443 $self->{children} = []; 590 $self->{children} = [];
444 591
445 $self->SUPER::add ($widget); 592 $self->SUPER::add ($child);
446} 593}
447 594
448sub remove { 595sub remove {
449 my ($self, $widget) = @_; 596 my ($self, $widget) = @_;
450 597
… …
470 617
471package CFClient::UI::Window; 618package CFClient::UI::Window;
472 619
473our @ISA = CFClient::UI::Bin::; 620our @ISA = CFClient::UI::Bin::;
474 621
475use SDL::OpenGL; 622use CFClient::OpenGL;
476 623
477sub new { 624sub new {
478 my ($class, %arg) = @_; 625 my ($class, %arg) = @_;
479 626
480 my $self = $class->SUPER::new (%arg); 627 my $self = $class->SUPER::new (%arg);
481} 628}
482 629
483sub update { 630sub update {
484 my ($self) = @_; 631 my ($self) = @_;
485 632
486 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
487 $self->render_chld;
488 $self->SUPER::update; 634 $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} 635}
500 636
501sub size_allocate { 637sub size_allocate {
502 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
503 639
504 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
505 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
648sub render_child {
649 my ($self) = @_;
650
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT;
654
506 $self->render_chld; 655 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 };
507} 664}
508 665
509sub _draw { 666sub _draw {
510 my ($self) = @_; 667 my ($self) = @_;
511 668
512 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
513 670
514 my $tex = $self->{texture} 671 my $tex = $self->{texture}
515 or return; 672 or return;
516 673
517 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
519 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1;
521 677
522 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
523 679
524 glDisable GL_BLEND;
525 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
526} 681}
527 682
528############################################################################# 683#############################################################################
529 684
530package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
531 686
532our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
533 688
534sub new { die }
535
536sub size_request { 689sub size_request {
537 my ($self) = @_; 690 my ($self) = @_;
538 691
539 @$self{qw(child_w child_h)} = $self->child->size_request; 692 @$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)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
541 694
542 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
543} 696}
544 697
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 { 698sub size_allocate {
571 my ($self, $x, $y, $w, $h) = @_; 699 my ($self, $w, $h) = @_;
700
701 $self->update;
702}
703
704sub set_offset {
705 my ($self, $x, $y) = @_;
706
707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
572 738 }
573 $self->child->configure (2, 2, $w - 4, $h - 4);
574} 739}
575 740
576sub _draw { 741sub _render {
577 my ($self) = @_; 742 my ($self) = @_;
578 743
579 my $chld = $self->child; 744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
580 745
581 my ($w, $h) = $chld->size_request; 746 $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} 747}
593 748
594############################################################################# 749#############################################################################
595 750
596package CFClient::UI::FancyFrame; 751package CFClient::UI::ScrolledWindow;
597 752
598our @ISA = CFClient::UI::Bin::; 753our @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 754
606sub new { 755sub new {
607 my $class = shift; 756 my $class = shift;
608 757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort),
770 slider => $slider,
771 @_,
772 );
773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 $class->SUPER::new (
796 bg => undef,
797 @_,
798 )
799}
800
801sub _draw {
802 my ($self) = @_;
803
804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
806
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glColor @{ $self->{bg} };
810
811 glBegin GL_QUADS;
812 glVertex 0 , 0;
813 glVertex 0 , $h;
814 glVertex $w, $h;
815 glVertex $w, 0;
816 glEnd;
817
818 glDisable GL_BLEND;
819 }
820
821 $self->SUPER::_draw;
822}
823
824#############################################################################
825
826package CFClient::UI::FancyFrame;
827
828our @ISA = CFClient::UI::Bin::;
829
830use CFClient::OpenGL;
831
832my @tex =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
835
836sub new {
837 my $class = shift;
838
609 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
610 840
611 $class->SUPER::new ( 841 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 844 border => 0.6,
845 can_events => 1,
615 @_ 846 @_
616 ) 847 );
848
849 $self->{title} &&= new CFClient::UI::Label
850 align => 0,
851 valign => 1,
852 text => $self->{title},
853 fontsize => $self->{border};
854
855 $self
856}
857
858sub border {
859 int $_[0]{border} * $::FONTSIZE
617} 860}
618 861
619sub size_request { 862sub size_request {
620 my ($self) = @_; 863 my ($self) = @_;
621 864
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624 my ($w, $h) = $self->SUPER::size_request; 865 my ($w, $h) = $self->SUPER::size_request;
625 866
626 ( 867 (
627 $w + $self->{border} * 2, 868 $w + $self->border * 2,
628 $h + $self->{border} * 2, 869 $h + $self->border * 2,
629 ) 870 )
630} 871}
631 872
632sub size_allocate { 873sub size_allocate {
633 my ($self, $w, $h) = @_; 874 my ($self, $w, $h) = @_;
634 875
635 $h -= List::Util::max 0, $self->{border} * 2; 876 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 877 $w -= List::Util::max 0, $self->border * 2;
637 878
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
880 if $self->{title};
881
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 882 $self->child->configure ($self->border, $self->border, $w, $h);
639} 883}
640 884
641sub button_down { 885sub button_down {
642 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
643 887
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 888 my ($w, $h) = @$self{qw(w h)};
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 889 my $border = $self->border;
646 890
891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
898
899 my $mx = $x < $border;
900 my $my = $y < $border;
649 901
650 $self->{motion} = sub { 902 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
652 904
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
654 907
655 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
656 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
657 $self->check_size; 911 $self->check_size;
658 }; 912 };
659 913
660 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
661 && $y >= 0 && $y < $self->{border}) {
662
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
665 917
666 $self->{motion} = sub { 918 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
668 920
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 921 ($x, $y) = ($ev->{x}, $ev->{y});
670 922
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 923 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 924 $self->update;
673 }; 925 };
674 } 926 }
… …
690 my ($self) = @_; 942 my ($self) = @_;
691 943
692 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
693 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
694 946
695 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 949
950 my $border = $self->border;
951
700 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
705 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
706 my $bg = $tex[0]; 959 my $bg = $tex[0];
707 960
708 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
710 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
711 964
712 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
713 966
714 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
718 972
719 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 974
975 $self->{title}->draw if $self->{title};
721 976
722 $self->child->draw; 977 $self->child->draw;
723} 978}
724 979
725############################################################################# 980#############################################################################
… …
728 983
729our @ISA = CFClient::UI::Base::; 984our @ISA = CFClient::UI::Base::;
730 985
731use List::Util qw(max sum); 986use List::Util qw(max sum);
732 987
733use SDL::OpenGL; 988use CFClient::OpenGL;
734 989
735sub new { 990sub new {
736 my $class = shift; 991 my $class = shift;
737 992
738 $class->SUPER::new ( 993 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 1000 my ($self, $x, $y, $child) = @_;
746 1001
747 $child->set_parent ($self); 1002 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
749 1004
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 1005 $child->check_size;
1006}
1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
753} 1010}
754 1011
755# TODO: move to container class maybe? send childs a signal on removal? 1012# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 1013sub clear {
757 my ($self) = @_; 1014 my ($self) = @_;
758 1015
1016 my @children = $self->children;
759 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
760 $self->update; 1024 $self->update;
761} 1025}
762 1026
763sub get_wh { 1027sub get_wh {
764 my ($self) = @_; 1028 my ($self) = @_;
… …
770 or next; 1034 or next;
771 1035
772 for my $x (0 .. $#$row) { 1036 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 1037 my $widget = $row->[$x]
774 or next; 1038 or next;
775 my ($w, $h) = $widget->size_request; 1039 my ($w, $h) = @$widget{qw(req_w req_h)};
776 1040
777 $w[$x] = max $w[$x], $w; 1041 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 1042 $h[$y] = max $h[$y], $h;
779 } 1043 }
780 } 1044 }
… …
885 1149
886 ($h, $w) = ($w, $h); 1150 ($h, $w) = ($w, $h);
887 1151
888 my $children = $self->{children}; 1152 my $children = $self->{children};
889 1153
890 my @h = map +($_->size_request)[0], @$children; 1154 my @h = map $_->{req_w}, @$children;
891 1155
892 my $req_h = List::Util::sum @h; 1156 my $req_h = List::Util::sum @h;
893 1157
894 if ($req_h > $h) { 1158 if ($req_h > $h) {
895 # ah well, not enough space 1159 # ah well, not enough space
… …
941} 1205}
942 1206
943sub size_allocate { 1207sub size_allocate {
944 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
945 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
946 my $children = $self->{children}; 1212 my $children = $self->{children};
947 1213
948 my @h = map +($_->size_request)[1], @$children; 1214 my @h = map $_->{req_h}, @$children;
949 1215
950 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
951 1217
952 if ($req_h > $h) { 1218 if ($req_h > $h) {
953 # ah well, not enough space 1219 # ah well, not enough space
… …
981 1247
982package CFClient::UI::Label; 1248package CFClient::UI::Label;
983 1249
984our @ISA = CFClient::UI::Base::; 1250our @ISA = CFClient::UI::Base::;
985 1251
986use SDL::OpenGL; 1252use CFClient::OpenGL;
987 1253
988sub new { 1254sub new {
989 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
990 1256
991 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1259 #font => default_font
994 text => "", 1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1263 fontsize => 1,
995 align => -1, 1264 align => -1,
996 valign => -1, 1265 valign => -1,
997 padding => 2, 1266 padding => 2,
998 layout => new CFClient::Layout, 1267 can_events => 0,
999 %arg 1268 %arg
1000 ); 1269 );
1001 1270
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1271 if (exists $self->{template}) {
1272 my $layout = new CFClient::Layout;
1273 $layout->set_text (delete $self->{template});
1274 $self->{template} = $layout;
1275 }
1003 1276
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1006 1282
1007 $self 1283 $self
1008} 1284}
1009 1285
1010sub escape_text { 1286sub escape {
1011 local $_ = $_[1]; 1287 local $_ = $_[1];
1012 1288
1013 s/&/&amp;/g; 1289 s/&/&amp;/g;
1014 s/>/&gt;/g; 1290 s/>/&gt;/g;
1015 s/</&lt;/g; 1291 s/</&lt;/g;
1016 1292
1017 $_[1] 1293 $_[1]
1018} 1294}
1019 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1020sub set_text { 1303sub set_text {
1021 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1022 1305
1306 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text";
1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1023 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1024 1311
1025 delete $self->{texture};
1026 $self->update; 1312 $self->update;
1313 $self->check_size;
1027} 1314}
1028 1315
1029sub set_markup { 1316sub set_markup {
1030 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1031 1318
1319 return if $self->{text} eq "M$markup";
1320 $self->{text} = "M$markup";
1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1032 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1033 1326
1034 delete $self->{texture};
1035 $self->update; 1327 $self->update;
1328 $self->check_size;
1036} 1329}
1037 1330
1038sub size_request { 1331sub size_request {
1039 my ($self) = @_; 1332 my ($self) = @_;
1040 1333
1041 $self->{layout}->set_width; 1334 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1);
1042 $self->{layout}->set_height ($self->{fontsize}); 1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1337
1044 my ($w, $h) = $self->{layout}->size; 1338 my ($w, $h) = $self->{layout}->size;
1339
1340 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font};
1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1343
1344 my ($w2, $h2) = $self->{template}->size;
1345
1346 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2;
1348 }
1045 1349
1046 ( 1350 (
1047 $w + $self->{padding} * 2, 1351 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1352 $h + $self->{padding} * 2,
1049 ) 1353 )
… …
1053 my ($self, $w, $h) = @_; 1357 my ($self, $w, $h) = @_;
1054 1358
1055 delete $self->{texture}; 1359 delete $self->{texture};
1056} 1360}
1057 1361
1058sub update { 1362sub set_fontsize {
1059 my ($self) = @_; 1363 my ($self, $fontsize) = @_;
1060 1364
1365 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1366 delete $self->{texture};
1367
1062 $self->SUPER::update; 1368 $self->update;
1369 $self->check_size;
1063} 1370}
1064 1371
1065sub _draw { 1372sub _draw {
1066 my ($self) = @_; 1373 my ($self) = @_;
1067 1374
1068 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1069 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1071 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1072 }; 1392 };
1073 1393
1074 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1076 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1078 1396
1397 if ($tex->{format} == GL_ALPHA) {
1079 glColor @{$self->{fg}}; 1398 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}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1094 1403
1095 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1096 glDisable GL_BLEND;
1097} 1405}
1098 1406
1099############################################################################# 1407#############################################################################
1100 1408
1101package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
1102 1410
1103our @ISA = CFClient::UI::Label::; 1411our @ISA = CFClient::UI::Label::;
1104 1412
1105use SDL; 1413use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1414
1108sub new { 1415sub new {
1109 my $class = shift; 1416 my $class = shift;
1110 1417
1111 $class->SUPER::new ( 1418 $class->SUPER::new (
1112 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1113 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1114 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1116 can_hover => 1, 1423 can_hover => 1,
1117 can_focus => 1, 1424 can_focus => 1,
1118 valign => 0, 1425 valign => 0,
1426 can_events => 1,
1119 @_ 1427 @_
1120 ) 1428 )
1121} 1429}
1122 1430
1123sub _set_text { 1431sub _set_text {
… …
1125 1433
1126 delete $self->{cur_h}; 1434 delete $self->{cur_h};
1127 1435
1128 return if $self->{text} eq $text; 1436 return if $self->{text} eq $text;
1129 1437
1438 delete $self->{texture};
1439
1130 $self->{last_activity} = $::NOW; 1440 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1441 $self->{text} = $text;
1132 1442
1133 $text =~ s/./*/g if $self->{hidden}; 1443 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1135 1445
1136 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1137} 1447}
1138 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1139sub get_text { 1458sub get_text {
1140 $_[0]{text} 1459 $_[0]{text}
1141} 1460}
1142 1461
1143sub size_request { 1462sub size_request {
… …
1149} 1468}
1150 1469
1151sub size_allocate { 1470sub size_allocate {
1152 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1153 1472
1154 $self->_set_text ($self->{text}); 1473 $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} 1474}
1164 1475
1165sub key_down { 1476sub key_down {
1166 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1167 1478
1168 my $mod = $ev->key_mod; 1479 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1480 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1481 my $uni = $ev->{unicode};
1172 1482
1173 my $text = $self->get_text; 1483 my $text = $self->get_text;
1174 1484
1175 if ($sym == SDLK_BACKSPACE) { 1485 if ($uni == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1487 } elsif ($uni == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1497 } elsif ($uni == 27) {
1188 $self->emit ('escape'); 1498 $self->emit ('escape');
1189 } elsif ($uni) { 1499 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1501 }
1192 1502
… …
1267 1577
1268package CFClient::UI::Entry; 1578package CFClient::UI::Entry;
1269 1579
1270our @ISA = CFClient::UI::EntryBase::; 1580our @ISA = CFClient::UI::EntryBase::;
1271 1581
1272use SDL; 1582use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1583
1275sub key_down { 1584sub key_down {
1276 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1277 1586
1278 my $sym = $ev->key_sym; 1587 my $sym = $ev->{sym};
1279 1588
1280 if ($sym == SDLK_RETURN) { 1589 if ($sym == 13) {
1590 unshift @{$self->{history}},
1591 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = '';
1281 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1282 $self->update; 1595 $self->update;
1596
1597 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text;
1600 }
1601 if (@{$self->{history} || []} > 0) {
1602 $self->{history_pointer}++;
1603 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1604 $self->{history_pointer} = @{$self->{history} || []} - 1;
1605 }
1606 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1607 }
1608
1609 } elsif ($sym == CFClient::SDLK_DOWN) {
1610 $self->{history_pointer}--;
1611 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1612
1613 if ($self->{history_pointer} >= 0) {
1614 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1615 } else {
1616 $self->set_text ($self->{history_saveback});
1617 }
1283 1618
1284 } else { 1619 } else {
1285 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1286 } 1621 }
1287 1622
… …
1291 1626
1292package CFClient::UI::Button; 1627package CFClient::UI::Button;
1293 1628
1294our @ISA = CFClient::UI::Label::; 1629our @ISA = CFClient::UI::Label::;
1295 1630
1296use SDL; 1631use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1632
1299my @tex = 1633my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1634 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1635 qw(b1_button_active.png);
1302 1636
1303sub new { 1637sub new {
1304 my $class = shift; 1638 my $class = shift;
1305 1639
1306 $class->SUPER::new ( 1640 $class->SUPER::new (
1307 padding => 4, 1641 padding => 4,
1308 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1309 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1311 can_hover => 1, 1645 can_hover => 1,
1312 align => 0, 1646 align => 0,
1313 valign => 0, 1647 valign => 0,
1648 can_events => 1,
1314 @_ 1649 @_
1315 ) 1650 )
1316} 1651}
1317 1652
1318sub button_up { 1653sub button_up {
… …
1331 1666
1332 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1333 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1334 } 1669 }
1335 1670
1336 glEnable GL_BLEND;
1337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1338 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1339 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1340 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1341 1674
1342 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1343 1676
1344 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1345 glDisable GL_BLEND;
1346 1678
1347 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1348} 1680}
1349 1681
1350############################################################################# 1682#############################################################################
… …
1352package CFClient::UI::CheckBox; 1684package CFClient::UI::CheckBox;
1353 1685
1354our @ISA = CFClient::UI::DrawBG::; 1686our @ISA = CFClient::UI::DrawBG::;
1355 1687
1356my @tex = 1688my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1689 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1690 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1691
1360use SDL; 1692use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1693
1363sub new { 1694sub new {
1364 my $class = shift; 1695 my $class = shift;
1365 1696
1366 $class->SUPER::new ( 1697 $class->SUPER::new (
… …
1398 1729
1399 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1400 1731
1401 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1402 1733
1403 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1404 glEnable GL_TEXTURE_2D; 1736 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); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1410
1411 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1739}
1740
1741#############################################################################
1742
1743package CFClient::UI::Image;
1744
1745our @ISA = CFClient::UI::Base::;
1746
1747use CFClient::OpenGL;
1748use Carp qw/confess/;
1749
1750our %loaded_images;
1751
1752sub new {
1753 my $class = shift;
1754
1755 my $self = $class->SUPER::new (can_events => 0, @_);
1756
1757 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1758
1759 $loaded_images{$self->{image}} ||=
1760 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1761
1762 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1763
1764 Scalar::Util::weaken $loaded_images{$self->{image}};
1765
1766 $self->{aspect} = $tex->{w} / $tex->{h};
1767
1768 $self
1769}
1770
1771sub size_request {
1772 my ($self) = @_;
1773
1774 ($self->{tex}->{w}, $self->{tex}->{h})
1775}
1776
1777sub _draw {
1778 my ($self) = @_;
1779
1780 my $tex = $self->{tex};
1781
1782 my ($w, $h) = ($self->{w}, $self->{h});
1783
1784 if ($self->{rot90}) {
1785 glRotate 90, 0, 0, 1;
1786 glTranslate 0, -$self->{w}, 0;
1787
1788 ($w, $h) = ($h, $w);
1789 }
1790
1791 glEnable GL_TEXTURE_2D;
1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1793
1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1795
1412 glDisable GL_BLEND; 1796 glDisable GL_TEXTURE_2D;
1413} 1797}
1414 1798
1415############################################################################# 1799#############################################################################
1416 1800
1417package CFClient::UI::VGauge; 1801package CFClient::UI::VGauge;
1418 1802
1419our @ISA = CFClient::UI::Base::; 1803our @ISA = CFClient::UI::Base::;
1420 1804
1421use SDL::OpenGL; 1805use List::Util qw(min max);
1806
1807use CFClient::OpenGL;
1422 1808
1423my %tex = ( 1809my %tex = (
1424 food => [ 1810 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1811 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1812 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ], 1813 ],
1428 grace => [ 1814 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1815 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1430 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1816 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1431 ], 1817 ],
1432 hp => [ 1818 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1820 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ], 1821 ],
1436 mana => [ 1822 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1438 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1824 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1439 ], 1825 ],
1440); 1826);
1441 1827
1442# eg. VGauge->new (gauge => 'food'), default gauge: food 1828# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1829sub new {
1444 my $class = shift; 1830 my $class = shift;
1445 1831
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1832 my $self = $class->SUPER::new (
1833 type => 'food',
1834 @_
1835 );
1836
1837 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1447 1838
1448 $self 1839 $self
1449} 1840}
1450 1841
1451sub size_request { 1842sub size_request {
1452 my ($self) = @_; 1843 my ($self) = @_;
1453 1844
1454 my $tex = $tex{$self->{gauge}}[0]; 1845 #my $tex = $tex{$self->{type}}[0];
1455
1456 @$tex{qw(w h)} 1846 #@$tex{qw(w h)}
1847 (0, 0)
1457} 1848}
1458 1849
1459sub set_max { 1850sub set_max {
1460 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1461 1852
1853 return if $self->{max_val} == $max;
1854
1462 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1463} 1857}
1464 1858
1465sub set_value { 1859sub set_value {
1466 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1467 1861
1468 $self->set_max ($max) 1862 $self->set_max ($max)
1469 if defined $max; 1863 if defined $max;
1470 1864
1471 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1472 $self->{val} = $val; 1867 $self->{val} = $val;
1473
1474 $self->update; 1868 $self->update;
1475} 1869}
1476 1870
1477sub _draw { 1871sub _draw {
1478 my ($self) = @_; 1872 my ($self) = @_;
1479 1873
1480 my $tex = $tex{$self->{gauge}}; 1874 my $tex = $tex{$self->{type}};
1875 my ($t1, $t2, $t3) = @$tex;
1481 1876
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1877 my ($w, $h) = ($self->{w}, $self->{h});
1483 1878
1879 if ($self->{vertical}) {
1880 glRotate 90, 0, 0, 1;
1881 glTranslate 0, -$self->{w}, 0;
1882
1883 ($w, $h) = ($h, $w);
1884 }
1885
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1886 my $ycut = $self->{val} / ($self->{max_val} || 1);
1485 $ycut = 1 if $self->{val} > $self->{max_val};
1486 1887
1487 my $t1 = $tex->[0]; 1888 my $ycut1 = max 0, min 1, $ycut;
1488 my $t2 = $tex->[1]; 1889 my $ycut2 = max 0, min 1, $ycut - 1;
1890
1891 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2);
1489 1893
1490 glEnable GL_BLEND; 1894 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1896 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1898
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}; 1899 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1900 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1901 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1902 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1903 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1904 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1905 glEnd;
1507 1906
1508 $yp += $h1; 1907 my $ycut1 = List::Util::min 1, $ycut;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1908 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1909 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1910 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1911 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; 1912 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1913 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516 glEnd; 1914 glEnd;
1915
1916 if ($t3) {
1917 glBindTexture GL_TEXTURE_2D, $t3->{name};
1918 glBegin GL_QUADS;
1919 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1920 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1921 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1922 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1923 glEnd;
1924 }
1517 1925
1518 glDisable GL_BLEND; 1926 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1520} 1928}
1521 1929
1522############################################################################# 1930#############################################################################
1523 1931
1932package CFClient::UI::Gauge;
1933
1934our @ISA = CFClient::UI::VBox::;
1935
1936sub new {
1937 my ($class, %arg) = @_;
1938
1939 my $self = $class->SUPER::new (
1940 tooltip => $arg{type},
1941 can_hover => 1,
1942 can_events => 1,
1943 %arg,
1944 );
1945
1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1948 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1949
1950 $self
1951}
1952
1953sub set_fontsize {
1954 my ($self, $fsize) = @_;
1955
1956 $self->{value}->set_fontsize ($fsize);
1957 $self->{max} ->set_fontsize ($fsize);
1958}
1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1967sub set_value {
1968 my ($self, $val, $max) = @_;
1969
1970 $self->set_max ($max)
1971 if defined $max;
1972
1973 $self->{gauge}->set_value ($val, $max);
1974 $self->{value}->set_text ($val);
1975}
1976
1977#############################################################################
1978
1524package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
1525 1980
1526use strict; 1981use strict;
1527 1982
1528use SDL::OpenGL; 1983use CFClient::OpenGL;
1529 1984
1530our @ISA = CFClient::UI::DrawBG::; 1985our @ISA = CFClient::UI::DrawBG::;
1531 1986
1532my @tex = 1987my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1998 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1548 req_w => 40, 2003 req_w => $::WIDTH / 80,
1549 req_h => 13, 2004 req_h => $::WIDTH / 80,
1550 vertical => 0, 2005 vertical => 0,
1551 can_hover => 1, 2006 can_hover => 1,
1552 inner_pad => 5, 2007 inner_pad => 5,
1553 @_ 2008 @_
1554 ); 2009 );
… …
1637 $page ||= 2; 2092 $page ||= 2;
1638 2093
1639 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1640 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1641 2096
1642 glEnable GL_BLEND;
1643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1644 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1646 2099
1647 # draw background 2100 # draw background
1648 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1649 2102
1650 # draw handle 2103 # draw handle
1651 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1652 2105
1653 glDisable GL_BLEND;
1654 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1655} 2107}
1656 2108
1657############################################################################# 2109#############################################################################
1658 2110
1659package CFClient::UI::TextView; 2111package CFClient::UI::TextView;
1660 2112
1661our @ISA = CFClient::UI::HBox::; 2113our @ISA = CFClient::UI::HBox::;
1662 2114
1663use SDL::OpenGL; 2115use CFClient::OpenGL;
1664 2116
1665sub new { 2117sub new {
1666 my $class = shift; 2118 my $class = shift;
1667 2119
1668 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6, 2121 fontsize => 1,
1670 req_h => $::HEIGHT / 6, 2122 can_events => 0,
1671 fontsize => $::FONTSIZE, 2123 #font => default_font
1672 @_, 2124 @_,
1673 2125
1674 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1675 par => [], 2127 par => [],
1676 height => 0, 2128 height => 0,
1677 children => [ 2129 children => [
1678 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1679 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1680 ], 2132 ],
1681 ); 2133 );
1682 2134
1683 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1684 $self->update;
1685 });
1686 2136
1687 $self 2137 $self
1688} 2138}
1689 2139
1690sub set_fontsize { 2140sub set_fontsize {
… …
1697sub text_height { 2147sub text_height {
1698 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1699 2149
1700 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1701 2151
1702 $layout->set_height ($self->{fontsize}); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1704 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1705 2155
1706 ($layout->size)[1] 2156 ($layout->size)[1]
1707} 2157}
1708 2158
1709sub reflow { 2159sub reflow {
… …
1711 2161
1712 $self->{need_reflow}++; 2162 $self->{need_reflow}++;
1713 $self->update; 2163 $self->update;
1714} 2164}
1715 2165
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 2166sub size_allocate {
1723 my ($self, $w, $h) = @_; 2167 my ($self, $w, $h) = @_;
1724 2168
2169 $self->SUPER::size_allocate ($w, $h);
2170
2171 $self->{layout}->set_font ($self->{font}) if $self->{font};
1725 $self->{layout}->set_height ($self->{fontsize}); 2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 2173 $self->{layout}->set_width ($self->{children}[0]{w});
1727 2174
1728 $self->reflow; 2175 $self->reflow;
1729 $self->update;
1730} 2176}
1731 2177
1732sub add_paragraph { 2178sub add_paragraph {
1733 my ($self, $color, $text) = @_; 2179 my ($self, $color, $text) = @_;
1734 2180
… …
1751 2197
1752 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
1753 2199
1754 delete $self->{texture}; 2200 delete $self->{texture};
1755 2201
1756 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
1757 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
1758 my $height = 0; 2204 my $height = 0;
1759 2205
1760 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
1761 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
1765 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1766 2212
1767 delete $self->{texture}; 2213 delete $self->{texture};
1768 } 2214 }
1769 2215
1770 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1771 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
1772 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
1773 2219
1774 glEnable GL_BLEND;
1775 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1776 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1778 2222
1779 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
1780 2224
… …
1783 2227
1784 my $y = 0; 2228 my $y = 0;
1785 2229
1786 my $layout = $self->{layout}; 2230 my $layout = $self->{layout};
1787 2231
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
1788 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2235 my $h = $par->[0];
1790 2236
1791 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
1792 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
1793 2240
1794 glColor @{ $par->[1] };
1795 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
1796 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1797 } 2243 }
1798 2244
1799 $y += $h; 2245 $y += $h;
1800 } 2246 }
1801 2247
1802 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804 }; 2249 };
1805 }); 2250 });
1806} 2251}
1807 2252
1808sub _draw { 2253sub _draw {
1809 my ($self) = @_; 2254 my ($self) = @_;
1810 2255
1811 if ($self->{texture}) {
1812 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2258 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1815 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
1816 }
1817 2261
1818 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
1819 2263
1820} 2264}
1821 2265
1822############################################################################# 2266#############################################################################
1823 2267
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; 2268package CFClient::UI::Animator;
2061 2269
2062use SDL::OpenGL; 2270use CFClient::OpenGL;
2063 2271
2064our @ISA = CFClient::UI::Bin::; 2272our @ISA = CFClient::UI::Bin::;
2065 2273
2066sub moveto { 2274sub moveto {
2067 my ($self, $x, $y) = @_; 2275 my ($self, $x, $y) = @_;
… …
2105 2313
2106sub new { 2314sub new {
2107 my $class = shift; 2315 my $class = shift;
2108 2316
2109 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2110 state => 0, 2318 state => 0,
2111 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2112 @_ 2320 @_
2113 ); 2321 );
2114 2322
2115 if ($self->{state}) { 2323 if ($self->{state}) {
… …
2136 $self->emit (changed => $self->{state}); 2344 $self->emit (changed => $self->{state});
2137} 2345}
2138 2346
2139############################################################################# 2347#############################################################################
2140 2348
2349package CFClient::UI::Tooltip;
2350
2351our @ISA = CFClient::UI::Bin::;
2352
2353use CFClient::OpenGL;
2354
2355sub new {
2356 my $class = shift;
2357
2358 $class->SUPER::new (
2359 @_,
2360 can_events => 0,
2361 )
2362}
2363
2364sub set_tooltip_from {
2365 my ($self, $widget) = @_;
2366
2367 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip},
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2374}
2375
2376sub size_request {
2377 my ($self) = @_;
2378
2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2380
2381 ($w + 4, $h + 4)
2382}
2383
2384sub size_allocate {
2385 my ($self, $w, $h) = @_;
2386
2387 $self->SUPER::size_allocate ($w - 4, $h - 4);
2388}
2389
2390sub _draw {
2391 my ($self) = @_;
2392
2393 glTranslate 0.375, 0.375;
2394
2395 my ($w, $h) = @$self{qw(w h)};
2396
2397 glColor 1, 0.8, 0.4;
2398 glBegin GL_QUADS;
2399 glVertex 0 , 0;
2400 glVertex 0 , $h;
2401 glVertex $w, $h;
2402 glVertex $w, 0;
2403 glEnd;
2404
2405 glColor 0, 0, 0;
2406 glBegin GL_LINE_LOOP;
2407 glVertex 0 , 0;
2408 glVertex 0 , $h;
2409 glVertex $w, $h;
2410 glVertex $w, 0;
2411 glEnd;
2412
2413 glTranslate 2 - 0.375, 2 - 0.375;
2414 $self->SUPER::_draw;
2415}
2416
2417#############################################################################
2418
2419package CFClient::UI::Face;
2420
2421our @ISA = CFClient::UI::Base::;
2422
2423use CFClient::OpenGL;
2424
2425sub new {
2426 my $class = shift;
2427
2428 $class->SUPER::new (
2429 aspect => 1,
2430 @_,
2431 )
2432}
2433
2434sub size_request {
2435 (32, 8)
2436}
2437
2438sub _draw {
2439 my ($self) = @_;
2440
2441 return unless $::CONN;#d# manage and cache textures differently
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2443
2444 # TODO animation
2445 if ($tex) {
2446 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D;
2451 }
2452}
2453
2454#############################################################################
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566}
2567
2568#############################################################################
2569
2570package CFClient::UI::Menu;
2571
2572our @ISA = CFClient::UI::FancyFrame::;
2573
2574use CFClient::OpenGL;
2575
2576sub new {
2577 my $class = shift;
2578
2579 my $self = $class->SUPER::new (
2580 items => [],
2581 z => 100,
2582 @_,
2583 );
2584
2585 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2586
2587 for my $item (@{ $self->{items} }) {
2588 my ($widget, $cb) = @$item;
2589
2590 # handle various types of items, only text for now
2591 if (!ref $widget) {
2592 $widget = new CFClient::UI::Label
2593 can_hover => 1,
2594 can_events => 1,
2595 text => $widget;
2596 }
2597
2598 $self->{item}{$widget} = $item;
2599
2600 $self->{vbox}->add ($widget);
2601 }
2602
2603 $self
2604}
2605
2606# popup given the event (must be a mouse button down event currently)
2607sub popup {
2608 my ($self, $ev) = @_;
2609
2610 $self->emit ("popdown");
2611
2612 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self;
2614 $self->{button} = $ev->{button};
2615
2616 $self->show;
2617 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2618}
2619
2620sub mouse_motion {
2621 my ($self, $ev, $x, $y) = @_;
2622
2623 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER};
2626}
2627
2628sub button_up {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB;
2633 $self->hide;
2634
2635 $self->emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover};
2637 }
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::Statusbox;
2643
2644our @ISA = CFClient::UI::VBox::;
2645
2646sub reorder {
2647 my ($self) = @_;
2648 my $NOW = time;
2649
2650 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 }
2653
2654 my @widgets;
2655
2656 my @items = sort {
2657 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} };
2660
2661 my $count = 10 + 1;
2662 for my $item (@items) {
2663 last unless --$count;
2664
2665 push @widgets, $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text};
2670
2671 for ($short) {
2672 s/^\s+//;
2673 s/\012.*/…/s;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 }
2677
2678 new CFClient::UI::Label
2679 markup => $short,
2680 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize},
2684 color => $item->{color},
2685 can_events => 1,
2686 can_hover => 1
2687 };
2688 }
2689
2690 $self->clear;
2691 $self->SUPER::add (reverse @widgets);
2692}
2693
2694sub add {
2695 my ($self, $text, %arg) = @_;
2696
2697 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//;
2699
2700 my $timeout = time + ((delete $arg{timeout}) || 60);
2701
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703
2704 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) {
2706 $item->{count}++;
2707 } else {
2708 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text;
2710 }
2711 $item->{id} = ++$self->{id};
2712 $item->{timeout} = $timeout;
2713 delete $item->{label};
2714 } else {
2715 $self->{item}{$group} = {
2716 id => ++$self->{id},
2717 text => $text,
2718 timeout => $timeout,
2719 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0,
2723 count => 1,
2724 %arg,
2725 };
2726 }
2727
2728 $self->reorder;
2729}
2730
2731#############################################################################
2732
2141package CFClient::UI::Root; 2733package CFClient::UI::Root;
2142 2734
2143our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2144 2736
2145use SDL::OpenGL; 2737use CFClient::OpenGL;
2146 2738
2147sub check_size { 2739sub new {
2148 my ($self) = @_; 2740 my $class = shift;
2149 2741
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2742 $class->SUPER::new (
2151} 2743 @_,
2152 2744 )
2153sub size_request {
2154 ($::WIDTH, $::HEIGHT)
2155} 2745}
2156 2746
2157sub configure { 2747sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2159 2749
2160 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2161 2751 $self->{h} = $h;
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}};
2164} 2752}
2165 2753
2166sub _topleft { 2754sub check_size {
2755 my ($self) = @_;
2756
2757 $self->size_allocate ($self->{w}, $self->{h})
2758 if $self->{w};
2759}
2760
2761sub size_request {
2762 my ($self) = @_;
2763
2764 ($self->{w}, $self->{h})
2765}
2766
2767sub size_allocate {
2768 my ($self, $w, $h) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785
2786 for my $child ($self->children) {
2787 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2788
2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2791 $child->configure ($X, $Y, $W, $H);
2792 }
2793
2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2167 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2168 2800
2169 ($x, $y) 2801 ($x, $y)
2170} 2802}
2171 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2172sub update { 2810sub update {
2173 my ($self) = @_; 2811 my ($self) = @_;
2174 2812
2175 $self->check_size; 2813 $self->check_size;
2176 ::refresh (); 2814 $::WANT_REFRESH++;
2177} 2815}
2178 2816
2179sub add { 2817sub add {
2180 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2181 2819
2820 # integerise window positions
2821 $child->{x} = int $child->{x};
2822 $child->{y} = int $child->{y};
2823
2182 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2183} 2825}
2184 2826
2185sub on_refresh { 2827sub on_refresh {
2186 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2187 2829
2188 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2189} 2831}
2190 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2191sub draw { 2839sub draw {
2192 my ($self) = @_; 2840 my ($self) = @_;
2193 2841
2194 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2195 $_->() for values %$rcb; 2843 $_->()
2844 for values %{delete $self->{refresh_hook}};
2845 }
2846
2847 if ($self->{check_size}) {
2848 my @queue = ([], []);
2849
2850 for (;;) {
2851 if ($self->{check_size}) {
2852 # heuristic: check containers last
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2854 for values %{delete $self->{check_size}}
2855 }
2856
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2858
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2860 ? @$widget{qw(user_w user_h)}
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866
2867 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h;
2869
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2871
2872 $widget->{parent}->check_size
2873 if $widget->{parent};
2874 }
2875 }
2876 }
2877
2878 while ($self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) {
2880 my ($widget, $w, $h) = @$_;
2881
2882 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0;
2884
2885 $widget->{w} = $w;
2886 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h);
2888 $widget->emit (size_allocate => $w, $h);
2889 }
2890 }
2891
2892 while ($self->{post_alloc_hook}) {
2893 $_->()
2894 for values %{delete $self->{post_alloc_hook}};
2196 } 2895 }
2197 2896
2198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2200 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;
… …
2211############################################################################# 2910#############################################################################
2212 2911
2213package CFClient::UI; 2912package CFClient::UI;
2214 2913
2215$ROOT = new CFClient::UI::Root; 2914$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip;
2216 2916
22171 29171
2218 2918

Diff Legend

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