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.130 by root, Tue Apr 18 01:51:06 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
… …
288} 405}
289 406
290sub connect { 407sub connect {
291 my ($self, $signal, $cb) = @_; 408 my ($self, $signal, $cb) = @_;
292 409
293 push @{ $self->{cb}{$signal} }, $cb; 410 push @{ $self->{signal_cb}{$signal} }, $cb;
294} 411}
295 412
296sub emit { 413sub emit {
297 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
298 415
299 $_->($self, @args) 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300 for @{$self->{cb}{$signal} || []};
301} 417}
302 418
303sub DESTROY { 419sub DESTROY {
304 my ($self) = @_; 420 my ($self) = @_;
305 421
… …
311package CFClient::UI::DrawBG; 427package CFClient::UI::DrawBG;
312 428
313our @ISA = CFClient::UI::Base::; 429our @ISA = CFClient::UI::Base::;
314 430
315use strict; 431use strict;
316use SDL::OpenGL; 432use CFClient::OpenGL;
317 433
318sub new { 434sub new {
319 my $class = shift; 435 my $class = shift;
320 436
321 # range [value, low, high, page] 437 # range [value, low, high, page]
… …
350 466
351package CFClient::UI::Empty; 467package CFClient::UI::Empty;
352 468
353our @ISA = CFClient::UI::Base::; 469our @ISA = CFClient::UI::Base::;
354 470
471sub new {
472 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg);
474}
475
355sub size_request { 476sub size_request {
356 (0, 0) 477 (0, 0)
357} 478}
358 479
359sub draw { } 480sub draw { }
… …
367sub new { 488sub new {
368 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
369 490
370 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
371 492
372 my $self = $class->SUPER::new (children => [], %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
373 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
374 499
375 $self 500 $self
376} 501}
377 502
378sub add { 503sub add {
379 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
380 505
381 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
382 508
383 use sort 'stable'; 509 use sort 'stable';
384 510
385 $self->{children} = [ 511 $self->{children} = [
386 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
387 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
388 ]; 514 ];
389 515
390 $self->{w} = $self->{h} = -1;
391
392 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
393} 522}
394 523
395sub remove { 524sub remove {
396 my ($self, $widget) = @_; 525 my ($self, $child) = @_;
397 526
527 delete $child->{parent};
528 $child->hide;
529
398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399 531
400 $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;
401} 549}
402 550
403sub find_widget { 551sub find_widget {
404 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
405 553
… …
435 583
436 $class->SUPER::new (children => [$child], %arg) 584 $class->SUPER::new (children => [$child], %arg)
437} 585}
438 586
439sub add { 587sub add {
440 my ($self, $widget) = @_; 588 my ($self, $child) = @_;
441 589
442 $self->{children} = []; 590 $self->{children} = [];
443 591
444 $self->SUPER::add ($widget); 592 $self->SUPER::add ($child);
445} 593}
446 594
447sub remove { 595sub remove {
448 my ($self, $widget) = @_; 596 my ($self, $widget) = @_;
449 597
… …
469 617
470package CFClient::UI::Window; 618package CFClient::UI::Window;
471 619
472our @ISA = CFClient::UI::Bin::; 620our @ISA = CFClient::UI::Bin::;
473 621
474use SDL::OpenGL; 622use CFClient::OpenGL;
475 623
476sub new { 624sub new {
477 my ($class, %arg) = @_; 625 my ($class, %arg) = @_;
478 626
479 my $self = $class->SUPER::new (%arg); 627 my $self = $class->SUPER::new (%arg);
480} 628}
481 629
482sub update { 630sub update {
483 my ($self) = @_; 631 my ($self) = @_;
484 632
485 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
486 $self->render_chld;
487 $self->SUPER::update; 634 $self->SUPER::update;
488}
489
490sub render_chld {
491 my ($self) = @_;
492
493 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
494 glClearColor 0, 0, 0, 1;
495 glClear GL_COLOR_BUFFER_BIT;
496 $self->child->draw;
497 };
498} 635}
499 636
500sub size_allocate { 637sub size_allocate {
501 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
502 639
503 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
504 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
505 $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 };
506} 664}
507 665
508sub _draw { 666sub _draw {
509 my ($self) = @_; 667 my ($self) = @_;
510 668
511 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
512 670
513 my $tex = $self->{texture} 671 my $tex = $self->{texture}
514 or return; 672 or return;
515 673
516 glEnable GL_BLEND;
517 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
518 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
519 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;
520 677
521 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
522 679
523 glDisable GL_BLEND;
524 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
525} 681}
526 682
527############################################################################# 683#############################################################################
528 684
529package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
530 686
531our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
532 688
533sub new { die }
534
535sub size_request { 689sub size_request {
536 my ($self) = @_; 690 my ($self) = @_;
537 691
538 @$self{qw(child_w child_h)} = $self->child->size_request; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
540 694
541 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
542} 696}
543 697
544sub _draw {
545 my ($self) = @_;
546
547 $self->{children}[1]->draw;
548}
549
550
551#############################################################################
552
553package CFClient::UI::Frame;
554
555our @ISA = CFClient::UI::Bin::;
556
557use SDL::OpenGL;
558
559sub size_request {
560 my ($self) = @_;
561 my $chld = $self->child
562 or return (0, 0);
563
564 $chld->move (2, 2);
565
566 map { $_ + 4 } $chld->size_request;
567}
568
569sub size_allocate { 698sub size_allocate {
570 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)
571 738 }
572 $self->child->configure (2, 2, $w - 4, $h - 4);
573} 739}
574 740
575sub _draw { 741sub _render {
576 my ($self) = @_; 742 my ($self) = @_;
577 743
578 my $chld = $self->child; 744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
579 745
580 my ($w, $h) = $chld->size_request; 746 $self->SUPER::_render;
581
582 glBegin GL_QUADS;
583 glColor 0, 0, 0;
584 glVertex 0 , 0;
585 glVertex 0 , $h + 4;
586 glVertex $w + 4 , $h + 4;
587 glVertex $w + 4 , 0;
588 glEnd;
589
590 $chld->draw;
591} 747}
592 748
593############################################################################# 749#############################################################################
594 750
595package CFClient::UI::FancyFrame; 751package CFClient::UI::ScrolledWindow;
596 752
597our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
598
599use SDL::OpenGL;
600
601my @tex =
602 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
603 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
604 754
605sub new { 755sub new {
606 my $class = shift; 756 my $class = shift;
607 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
608 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
609 840
610 $class->SUPER::new ( 841 my $self = $class->SUPER::new (
611 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
612 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
613 border => int $::FONTSIZE * 0.8, 844 border => 0.6,
845 can_events => 1,
614 @_ 846 @_
615 ) 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
616} 860}
617 861
618sub size_request { 862sub size_request {
619 my ($self) = @_; 863 my ($self) = @_;
620 864
621 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
622
623 my ($w, $h) = $self->SUPER::size_request; 865 my ($w, $h) = $self->SUPER::size_request;
624 866
625 ( 867 (
626 $w + $self->{border} * 2, 868 $w + $self->border * 2,
627 $h + $self->{border} * 2, 869 $h + $self->border * 2,
628 ) 870 )
629} 871}
630 872
631sub size_allocate { 873sub size_allocate {
632 my ($self, $w, $h) = @_; 874 my ($self, $w, $h) = @_;
633 875
634 $h -= List::Util::max 0, $self->{border} * 2; 876 $h -= List::Util::max 0, $self->border * 2;
635 $w -= List::Util::max 0, $self->{border} * 2; 877 $w -= List::Util::max 0, $self->border * 2;
636 878
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
880 if $self->{title};
881
637 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 882 $self->child->configure ($self->border, $self->border, $w, $h);
638} 883}
639 884
640sub button_down { 885sub button_down {
641 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
642 887
643 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 888 my ($w, $h) = @$self{qw(w h)};
644 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 889 my $border = $self->border;
645 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});
646 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
647 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;
648 901
649 $self->{motion} = sub { 902 $self->{motion} = sub {
650 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
651 904
652 ($x, $y) = ($ev->motion_x, $ev->motion_y); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
653 907
654 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
655 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
656 $self->check_size; 911 $self->check_size;
657 }; 912 };
658 913
659 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
660 && $y >= 0 && $y < $self->{border}) {
661
662 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
663 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
664 917
665 $self->{motion} = sub { 918 $self->{motion} = sub {
666 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
667 920
668 ($x, $y) = ($ev->motion_x, $ev->motion_y); 921 ($x, $y) = ($ev->{x}, $ev->{y});
669 922
670 $self->move ($bx + $x - $ox, $by + $y - $oy); 923 $self->move ($bx + $x - $ox, $by + $y - $oy);
671 $self->update; 924 $self->update;
672 }; 925 };
673 } 926 }
… …
689 my ($self) = @_; 942 my ($self) = @_;
690 943
691 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
692 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
693 946
694 glEnable GL_BLEND;
695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698 949
950 my $border = $self->border;
951
699 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
700 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
701 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
702 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
703 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
704 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
705 my $bg = $tex[0]; 959 my $bg = $tex[0];
706 960
707 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
708 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
709 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
710 964
711 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
712 966
713 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
714 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
715 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
716 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
717 972
718 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
719 glDisable GL_BLEND; 974
975 $self->{title}->draw if $self->{title};
720 976
721 $self->child->draw; 977 $self->child->draw;
722} 978}
723 979
724############################################################################# 980#############################################################################
… …
727 983
728our @ISA = CFClient::UI::Base::; 984our @ISA = CFClient::UI::Base::;
729 985
730use List::Util qw(max sum); 986use List::Util qw(max sum);
731 987
732use SDL::OpenGL; 988use CFClient::OpenGL;
733 989
734sub new { 990sub new {
735 my $class = shift; 991 my $class = shift;
736 992
737 $class->SUPER::new ( 993 $class->SUPER::new (
… …
744 my ($self, $x, $y, $child) = @_; 1000 my ($self, $x, $y, $child) = @_;
745 1001
746 $child->set_parent ($self); 1002 $child->set_parent ($self);
747 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
748 1004
749 $self->{w} = $self->{h} = -1;
750
751 $child->check_size; 1005 $child->check_size;
1006}
1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
752} 1010}
753 1011
754# 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?
755sub clear { 1013sub clear {
756 my ($self) = @_; 1014 my ($self) = @_;
757 1015
1016 my @children = $self->children;
758 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
759 $self->update; 1024 $self->update;
760} 1025}
761 1026
762sub get_wh { 1027sub get_wh {
763 my ($self) = @_; 1028 my ($self) = @_;
… …
769 or next; 1034 or next;
770 1035
771 for my $x (0 .. $#$row) { 1036 for my $x (0 .. $#$row) {
772 my $widget = $row->[$x] 1037 my $widget = $row->[$x]
773 or next; 1038 or next;
774 my ($w, $h) = $widget->size_request; 1039 my ($w, $h) = @$widget{qw(req_w req_h)};
775 1040
776 $w[$x] = max $w[$x], $w; 1041 $w[$x] = max $w[$x], $w;
777 $h[$y] = max $h[$y], $h; 1042 $h[$y] = max $h[$y], $h;
778 } 1043 }
779 } 1044 }
… …
884 1149
885 ($h, $w) = ($w, $h); 1150 ($h, $w) = ($w, $h);
886 1151
887 my $children = $self->{children}; 1152 my $children = $self->{children};
888 1153
889 my @h = map +($_->size_request)[0], @$children; 1154 my @h = map $_->{req_w}, @$children;
890 1155
891 my $req_h = List::Util::sum @h; 1156 my $req_h = List::Util::sum @h;
892 1157
893 if ($req_h > $h) { 1158 if ($req_h > $h) {
894 # ah well, not enough space 1159 # ah well, not enough space
… …
940} 1205}
941 1206
942sub size_allocate { 1207sub size_allocate {
943 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
944 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
945 my $children = $self->{children}; 1212 my $children = $self->{children};
946 1213
947 my @h = map +($_->size_request)[1], @$children; 1214 my @h = map $_->{req_h}, @$children;
948 1215
949 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
950 1217
951 if ($req_h > $h) { 1218 if ($req_h > $h) {
952 # ah well, not enough space 1219 # ah well, not enough space
… …
980 1247
981package CFClient::UI::Label; 1248package CFClient::UI::Label;
982 1249
983our @ISA = CFClient::UI::Base::; 1250our @ISA = CFClient::UI::Base::;
984 1251
985use SDL::OpenGL; 1252use CFClient::OpenGL;
986 1253
987sub new { 1254sub new {
988 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
989 1256
990 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
991 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
992 fontsize => $::FONTSIZE, 1259 #font => default_font
993 text => "", 1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1263 fontsize => 1,
994 align => -1, 1264 align => -1,
995 valign => -1, 1265 valign => -1,
996 padding => 2, 1266 padding => 2,
997 layout => new CFClient::Layout, 1267 can_events => 0,
998 %arg 1268 %arg
999 ); 1269 );
1000 1270
1001 $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 }
1002 1276
1003 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1004 $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 }
1005 1282
1006 $self 1283 $self
1007} 1284}
1008 1285
1009sub escape_text { 1286sub escape {
1010 local $_ = $_[1]; 1287 local $_ = $_[1];
1011 1288
1012 s/&/&amp;/g; 1289 s/&/&amp;/g;
1013 s/>/&gt;/g; 1290 s/>/&gt;/g;
1014 s/</&lt;/g; 1291 s/</&lt;/g;
1015 1292
1016 $_[1] 1293 $_[1]
1017} 1294}
1018 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1019sub set_text { 1303sub set_text {
1020 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1021 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;
1022 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1023 1311
1024 delete $self->{texture};
1025 $self->update; 1312 $self->update;
1313 $self->check_size;
1026} 1314}
1027 1315
1028sub set_markup { 1316sub set_markup {
1029 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1030 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;
1031 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1032 1326
1033 delete $self->{texture};
1034 $self->update; 1327 $self->update;
1328 $self->check_size;
1035} 1329}
1036 1330
1037sub size_request { 1331sub size_request {
1038 my ($self) = @_; 1332 my ($self) = @_;
1039 1333
1040 $self->{layout}->set_width; 1334 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1);
1041 $self->{layout}->set_height ($self->{fontsize}); 1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042 1337
1043 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 }
1044 1349
1045 ( 1350 (
1046 $w + $self->{padding} * 2, 1351 $w + $self->{padding} * 2,
1047 $h + $self->{padding} * 2, 1352 $h + $self->{padding} * 2,
1048 ) 1353 )
… …
1052 my ($self, $w, $h) = @_; 1357 my ($self, $w, $h) = @_;
1053 1358
1054 delete $self->{texture}; 1359 delete $self->{texture};
1055} 1360}
1056 1361
1057sub update { 1362sub set_fontsize {
1058 my ($self) = @_; 1363 my ($self, $fontsize) = @_;
1059 1364
1365 $self->{fontsize} = $fontsize;
1060 delete $self->{texture}; 1366 delete $self->{texture};
1367
1061 $self->SUPER::update; 1368 $self->update;
1369 $self->check_size;
1062} 1370}
1063 1371
1064sub _draw { 1372sub _draw {
1065 my ($self) = @_; 1373 my ($self) = @_;
1066 1374
1067 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};
1068 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1069 $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
1070 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
1071 }; 1392 };
1072 1393
1073 glEnable GL_BLEND;
1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1075 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1076 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1077 1396
1397 if ($tex->{format} == GL_ALPHA) {
1078 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1079
1080 $self->{ox} = int (
1081 $self->{align} < 0 ? $self->{padding}
1082 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1083 : ($self->{w} - $tex->{w}) * 0.5
1084 );
1085
1086 $self->{oy} = int (
1087 $self->{valign} < 0 ? $self->{padding}
1088 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1089 : ($self->{h} - $tex->{h}) * 0.5
1090 );
1091
1092 $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 }
1093 1403
1094 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1095 glDisable GL_BLEND;
1096} 1405}
1097 1406
1098############################################################################# 1407#############################################################################
1099 1408
1100package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
1101 1410
1102our @ISA = CFClient::UI::Label::; 1411our @ISA = CFClient::UI::Label::;
1103 1412
1104use SDL; 1413use CFClient::OpenGL;
1105use SDL::OpenGL;
1106 1414
1107sub new { 1415sub new {
1108 my $class = shift; 1416 my $class = shift;
1109 1417
1110 $class->SUPER::new ( 1418 $class->SUPER::new (
1111 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1112 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1113 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1114 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1115 can_hover => 1, 1423 can_hover => 1,
1116 can_focus => 1, 1424 can_focus => 1,
1117 valign => 0, 1425 valign => 0,
1426 can_events => 1,
1118 @_ 1427 @_
1119 ) 1428 )
1120} 1429}
1121 1430
1122sub _set_text { 1431sub _set_text {
… …
1124 1433
1125 delete $self->{cur_h}; 1434 delete $self->{cur_h};
1126 1435
1127 return if $self->{text} eq $text; 1436 return if $self->{text} eq $text;
1128 1437
1438 delete $self->{texture};
1439
1129 $self->{last_activity} = $::NOW; 1440 $self->{last_activity} = $::NOW;
1130 $self->{text} = $text; 1441 $self->{text} = $text;
1131 1442
1132 $text =~ s/./*/g if $self->{hidden}; 1443 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1134 1445
1135 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1136} 1447}
1137 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
1138sub get_text { 1458sub get_text {
1139 $_[0]{text} 1459 $_[0]{text}
1140} 1460}
1141 1461
1142sub size_request { 1462sub size_request {
… …
1148} 1468}
1149 1469
1150sub size_allocate { 1470sub size_allocate {
1151 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1152 1472
1153 $self->_set_text ($self->{text}); 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1154}
1155
1156sub set_text {
1157 my ($self, $text) = @_;
1158
1159 $self->{cursor} = length $text;
1160 $self->_set_text ($text);
1161 $self->update;
1162} 1474}
1163 1475
1164sub key_down { 1476sub key_down {
1165 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1166 1478
1167 my $mod = $ev->key_mod; 1479 my $mod = $ev->{mod};
1168 my $sym = $ev->key_sym; 1480 my $sym = $ev->{sym};
1169
1170 my $uni = $ev->key_unicode; 1481 my $uni = $ev->{unicode};
1171 1482
1172 my $text = $self->get_text; 1483 my $text = $self->get_text;
1173 1484
1174 if ($sym == SDLK_BACKSPACE) { 1485 if ($uni == 8) {
1175 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176 } elsif ($sym == SDLK_DELETE) { 1487 } elsif ($uni == 127) {
1177 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1178 } elsif ($sym == SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1179 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1180 } elsif ($sym == SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1181 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1182 } elsif ($sym == SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1183 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1184 } elsif ($sym == SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1185 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1186 } elsif ($sym == SDLK_ESCAPE) { 1497 } elsif ($uni == 27) {
1187 $self->emit ('escape'); 1498 $self->emit ('escape');
1188 } elsif ($uni) { 1499 } elsif ($uni) {
1189 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1190 } 1501 }
1191 1502
… …
1266 1577
1267package CFClient::UI::Entry; 1578package CFClient::UI::Entry;
1268 1579
1269our @ISA = CFClient::UI::EntryBase::; 1580our @ISA = CFClient::UI::EntryBase::;
1270 1581
1271use SDL; 1582use CFClient::OpenGL;
1272use SDL::OpenGL;
1273 1583
1274sub key_down { 1584sub key_down {
1275 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1276 1586
1277 my $sym = $ev->key_sym; 1587 my $sym = $ev->{sym};
1278 1588
1279 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} = '';
1280 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1281 $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 }
1282 1618
1283 } else { 1619 } else {
1284 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1285 } 1621 }
1286 1622
… …
1290 1626
1291package CFClient::UI::Button; 1627package CFClient::UI::Button;
1292 1628
1293our @ISA = CFClient::UI::Label::; 1629our @ISA = CFClient::UI::Label::;
1294 1630
1295use SDL; 1631use CFClient::OpenGL;
1296use SDL::OpenGL;
1297 1632
1298my @tex = 1633my @tex =
1299 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1634 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1300 qw(b1_button_active.png); 1635 qw(b1_button_active.png);
1301 1636
1302sub new { 1637sub new {
1303 my $class = shift; 1638 my $class = shift;
1304 1639
1305 $class->SUPER::new ( 1640 $class->SUPER::new (
1306 padding => 4, 1641 padding => 4,
1307 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1308 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1309 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1310 can_hover => 1, 1645 can_hover => 1,
1311 align => 0, 1646 align => 0,
1312 valign => 0, 1647 valign => 0,
1648 can_events => 1,
1313 @_ 1649 @_
1314 ) 1650 )
1315} 1651}
1316 1652
1317sub button_up { 1653sub button_up {
… …
1330 1666
1331 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1332 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1333 } 1669 }
1334 1670
1335 glEnable GL_BLEND;
1336 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1340 1674
1341 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1342 1676
1343 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1344 glDisable GL_BLEND;
1345 1678
1346 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1347} 1680}
1348 1681
1349############################################################################# 1682#############################################################################
… …
1351package CFClient::UI::CheckBox; 1684package CFClient::UI::CheckBox;
1352 1685
1353our @ISA = CFClient::UI::DrawBG::; 1686our @ISA = CFClient::UI::DrawBG::;
1354 1687
1355my @tex = 1688my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1689 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1357 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1690 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358 1691
1359use SDL; 1692use CFClient::OpenGL;
1360use SDL::OpenGL;
1361 1693
1362sub new { 1694sub new {
1363 my $class = shift; 1695 my $class = shift;
1364 1696
1365 $class->SUPER::new ( 1697 $class->SUPER::new (
… …
1397 1729
1398 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;
1399 1731
1400 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1401 1733
1402 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1403 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1404 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1405
1406 my $tex = $self->{state} ? $tex[1] : $tex[0];
1407
1408 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1409
1410 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
1411 glDisable GL_BLEND; 1796 glDisable GL_TEXTURE_2D;
1412} 1797}
1413 1798
1414############################################################################# 1799#############################################################################
1415 1800
1416package CFClient::UI::VGauge; 1801package CFClient::UI::VGauge;
1417 1802
1418our @ISA = CFClient::UI::Base::; 1803our @ISA = CFClient::UI::Base::;
1419 1804
1420use SDL::OpenGL; 1805use List::Util qw(min max);
1806
1807use CFClient::OpenGL;
1421 1808
1422my %tex = ( 1809my %tex = (
1423 food => [ 1810 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1811 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1812 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ], 1813 ],
1427 grace => [ 1814 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1815 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1429 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/
1430 ], 1817 ],
1431 hp => [ 1818 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1820 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ], 1821 ],
1435 mana => [ 1822 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1437 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/
1438 ], 1825 ],
1439); 1826);
1440 1827
1441# eg. VGauge->new (gauge => 'food'), default gauge: food 1828# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new { 1829sub new {
1443 my $class = shift; 1830 my $class = shift;
1444 1831
1445 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};
1446 1838
1447 $self 1839 $self
1448} 1840}
1449 1841
1450sub size_request { 1842sub size_request {
1451 my ($self) = @_; 1843 my ($self) = @_;
1452 1844
1453 my $tex = $tex{$self->{gauge}}[0]; 1845 #my $tex = $tex{$self->{type}}[0];
1454
1455 @$tex{qw(w h)} 1846 #@$tex{qw(w h)}
1847 (0, 0)
1456} 1848}
1457 1849
1458sub set_max { 1850sub set_max {
1459 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1460 1852
1853 return if $self->{max_val} == $max;
1854
1461 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1462} 1857}
1463 1858
1464sub set_value { 1859sub set_value {
1465 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1466 1861
1467 $self->set_max ($max) 1862 $self->set_max ($max)
1468 if defined $max; 1863 if defined $max;
1469 1864
1470 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1471 $self->{val} = $val; 1867 $self->{val} = $val;
1472
1473 $self->update; 1868 $self->update;
1474} 1869}
1475 1870
1476sub _draw { 1871sub _draw {
1477 my ($self) = @_; 1872 my ($self) = @_;
1478 1873
1479 my $tex = $tex{$self->{gauge}}; 1874 my $tex = $tex{$self->{type}};
1875 my ($t1, $t2, $t3) = @$tex;
1480 1876
1481 my ($w, $h) = ($self->{w}, $self->{h}); 1877 my ($w, $h) = ($self->{w}, $self->{h});
1482 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
1483 my $ycut = $self->{val} / ($self->{max_val} || 1); 1886 my $ycut = $self->{val} / ($self->{max_val} || 1);
1484 $ycut = 1 if $self->{val} > $self->{max_val};
1485 1887
1486 my $t1 = $tex->[0]; 1888 my $ycut1 = max 0, min 1, $ycut;
1487 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);
1488 1893
1489 glEnable GL_BLEND; 1894 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D; 1896 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493 1898
1494 my $h1 = $self->{h} - $ycut * $self->{h};
1495 my $h2 = $ycut * $self->{h};
1496
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name}); 1899 glBindTexture GL_TEXTURE_2D, $t1->{name};
1500 glBegin (GL_QUADS); 1900 glBegin GL_QUADS;
1501 glTexCoord (0, 0); glVertex (0 , $yp); 1901 glTexCoord 0 , 0; glVertex 0 , 0;
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1); 1902 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1); 1903 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp); 1904 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1505 glEnd (); 1905 glEnd;
1506 1906
1507 $yp += $h1; 1907 my $ycut1 = List::Util::min 1, $ycut;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name}); 1908 glBindTexture GL_TEXTURE_2D, $t2->{name};
1510 glBegin (GL_QUADS); 1909 glBegin GL_QUADS;
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp); 1910 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2); 1911 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2); 1912 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp); 1913 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1515 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 }
1516 1925
1517 glDisable GL_BLEND; 1926 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1519} 1928}
1520 1929
1521############################################################################# 1930#############################################################################
1522 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
1523package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
1524 1980
1525use strict; 1981use strict;
1526 1982
1527use SDL::OpenGL; 1983use CFClient::OpenGL;
1528 1984
1529our @ISA = CFClient::UI::DrawBG::; 1985our @ISA = CFClient::UI::DrawBG::;
1530 1986
1531my @tex = 1987my @tex =
1532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1542 # TODO: calculations are off 1998 # TODO: calculations are off
1543 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1544 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1545 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1546 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1547 req_w => 40, 2003 req_w => $::WIDTH / 80,
1548 req_h => 13, 2004 req_h => $::WIDTH / 80,
1549 vertical => 0, 2005 vertical => 0,
1550 can_hover => 1, 2006 can_hover => 1,
1551 inner_pad => 5, 2007 inner_pad => 5,
1552 @_ 2008 @_
1553 ); 2009 );
… …
1636 $page ||= 2; 2092 $page ||= 2;
1637 2093
1638 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1639 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1640 2096
1641 glEnable GL_BLEND;
1642 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1643 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645 2099
1646 # draw background 2100 # draw background
1647 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1648 2102
1649 # draw handle 2103 # draw handle
1650 $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);
1651 2105
1652 glDisable GL_BLEND;
1653 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1654} 2107}
1655 2108
1656############################################################################# 2109#############################################################################
1657 2110
1658package CFClient::UI::TextView; 2111package CFClient::UI::TextView;
1659 2112
1660our @ISA = CFClient::UI::HBox::; 2113our @ISA = CFClient::UI::HBox::;
1661 2114
1662use SDL::OpenGL; 2115use CFClient::OpenGL;
1663 2116
1664sub new { 2117sub new {
1665 my $class = shift; 2118 my $class = shift;
1666 2119
1667 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1668 req_w => $::WIDTH / 6, 2121 fontsize => 1,
1669 req_h => $::HEIGHT / 6, 2122 can_events => 0,
1670 fontsize => $::FONTSIZE, 2123 #font => default_font
1671 @_, 2124 @_,
1672 2125
1673 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1674 par => [], 2127 par => [],
1675 height => 0, 2128 height => 0,
1676 children => [ 2129 children => [
1677 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1678 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1679 ], 2132 ],
1680 ); 2133 );
1681 2134
1682 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1683 $self->update;
1684 });
1685 2136
1686 $self 2137 $self
1687} 2138}
1688 2139
1689sub set_fontsize { 2140sub set_fontsize {
… …
1696sub text_height { 2147sub text_height {
1697 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1698 2149
1699 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1700 2151
1701 $layout->set_height ($self->{fontsize}); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1703 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1704 2155
1705 ($layout->size)[1] 2156 ($layout->size)[1]
1706} 2157}
1707 2158
1708sub reflow { 2159sub reflow {
… …
1710 2161
1711 $self->{need_reflow}++; 2162 $self->{need_reflow}++;
1712 $self->update; 2163 $self->update;
1713} 2164}
1714 2165
1715sub size_request {
1716 my ($self) = @_;
1717
1718 ($self->{req_w}, $self->{req_h})
1719}
1720
1721sub size_allocate { 2166sub size_allocate {
1722 my ($self, $w, $h) = @_; 2167 my ($self, $w, $h) = @_;
1723 2168
2169 $self->SUPER::size_allocate ($w, $h);
2170
2171 $self->{layout}->set_font ($self->{font}) if $self->{font};
1724 $self->{layout}->set_height ($self->{fontsize}); 2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725 $self->{layout}->set_width ($self->{w}); 2173 $self->{layout}->set_width ($self->{children}[0]{w});
1726 2174
1727 $self->reflow; 2175 $self->reflow;
1728 $self->update;
1729} 2176}
1730 2177
1731sub add_paragraph { 2178sub add_paragraph {
1732 my ($self, $color, $text) = @_; 2179 my ($self, $color, $text) = @_;
1733 2180
… …
1750 2197
1751 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
1752 2199
1753 delete $self->{texture}; 2200 delete $self->{texture};
1754 2201
1755 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
1756 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
1757 my $height = 0; 2204 my $height = 0;
1758 2205
1759 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
1760 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
1764 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1765 2212
1766 delete $self->{texture}; 2213 delete $self->{texture};
1767 } 2214 }
1768 2215
1769 $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 {
1770 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
1771 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
1772 2219
1773 glEnable GL_BLEND;
1774 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1775 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1777 2222
1778 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
1779 2224
… …
1782 2227
1783 my $y = 0; 2228 my $y = 0;
1784 2229
1785 my $layout = $self->{layout}; 2230 my $layout = $self->{layout};
1786 2231
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
1787 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
1788 my $h = $par->[0]; 2235 my $h = $par->[0];
1789 2236
1790 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
1791 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
1792 2240
1793 glColor @{ $par->[1] };
1794 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
1795 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);
1796 } 2243 }
1797 2244
1798 $y += $h; 2245 $y += $h;
1799 } 2246 }
1800 2247
1801 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
1802 glDisable GL_BLEND;
1803 }; 2249 };
1804 }); 2250 });
1805} 2251}
1806 2252
1807sub _draw { 2253sub _draw {
1808 my ($self) = @_; 2254 my ($self) = @_;
1809 2255
1810 if ($self->{texture}) {
1811 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
1812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1813 $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});
1814 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
1815 }
1816 2261
1817 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
1818 2263
1819} 2264}
1820 2265
1821############################################################################# 2266#############################################################################
1822 2267
1823package CFClient::UI::MapWidget;
1824
1825use strict;
1826
1827use List::Util qw(min max);
1828
1829use SDL;
1830use SDL::OpenGL;
1831
1832our @ISA = CFClient::UI::Base::;
1833
1834sub new {
1835 my $class = shift;
1836
1837 $class->SUPER::new (
1838 z => -1,
1839 can_focus => 1,
1840 list => (glGenLists 1),
1841 @_
1842 )
1843}
1844
1845sub key_down {
1846 print "MAPKEYDOWN\n";
1847}
1848
1849sub key_up {
1850}
1851
1852sub button_down {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->focus_in;
1856
1857 if ($ev->button == 2) {
1858 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861 $self->{motion} = sub {
1862 my ($ev, $x, $y) = @_;
1863
1864 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866 $::CFG->{map_shift_x} = $bw + $x - $ox;
1867 $::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869 $self->update;
1870 };
1871 }
1872}
1873
1874sub button_up {
1875 my ($self, $ev, $x, $y) = @_;
1876
1877 delete $self->{motion};
1878}
1879
1880sub mouse_motion {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->{motion}->($ev, $x, $y) if $self->{motion};
1884}
1885
1886sub size_request {
1887 (
1888 1 + 32 * int $::WIDTH / 32,
1889 1 + 32 * int $::HEIGHT / 32,
1890 )
1891}
1892
1893sub update {
1894 my ($self) = @_;
1895
1896 $self->{need_update} = 1;
1897 $self->SUPER::update;
1898}
1899
1900sub draw {
1901 my ($self) = @_;
1902
1903 if (delete $self->{need_update}) {
1904 glNewList $self->{list}, GL_COMPILE;
1905
1906 if ($::MAP) {
1907 my $sw = int $::WIDTH / 32;
1908 my $sh = int $::HEIGHT / 32;
1909
1910 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913 glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917 if ($::CFG->{fow_enable}) {
1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920 glConvolutionFilter2D (
1921 GL_CONVOLUTION_2D,
1922 GL_ALPHA,
1923 3, 3,
1924 GL_ALPHA, GL_FLOAT,
1925 pack "f*",
1926 0.1, 0.1, 0.1,
1927 0.1, 0.2, 0.1,
1928 0.1, 0.1, 0.1,
1929 );
1930 glEnable GL_CONVOLUTION_2D;
1931 }
1932
1933 $self->{fow_texture} = new CFClient::Texture
1934 w => $w,
1935 h => $h,
1936 data => $data,
1937 internalformat => GL_ALPHA,
1938 format => GL_ALPHA;
1939
1940 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942 glEnable GL_BLEND;
1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944 glEnable GL_TEXTURE_2D;
1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950 glDisable GL_TEXTURE_2D;
1951 glDisable GL_BLEND;
1952 }
1953
1954 # HACK BEGIN
1955 {
1956 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957 my ($w, $h) = (250, 250);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964 $self->{mapmap_texture} =
1965 new CFClient::Texture
1966 w => $w,
1967 h => $h,
1968 data => $::MAP->mapmap ($w, $h),
1969 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1972
1973 glDisable GL_TEXTURE_2D;
1974 glDisable GL_BLEND;
1975 }
1976 # HACK END
1977 }
1978
1979 glEndList;
1980 }
1981
1982 glPushMatrix;
1983 glCallList $self->{list};
1984 glPopMatrix;
1985
1986 if ($FOCUS != $self) {
1987 glColor 64/255, 64/255, 64/255;
1988 glLogicOp GL_AND;
1989 glEnable GL_COLOR_LOGIC_OP;
1990 glBegin GL_QUADS;
1991 glVertex 0, 0;
1992 glVertex 0, $::HEIGHT;
1993 glVertex $::WIDTH, $::HEIGHT;
1994 glVertex $::WIDTH, 0;
1995 glEnd;
1996 glDisable GL_COLOR_LOGIC_OP;
1997 }
1998}
1999
2000my %DIR = (
2001 SDLK_KP8, [1, "north"],
2002 SDLK_KP9, [2, "northeast"],
2003 SDLK_KP6, [3, "east"],
2004 SDLK_KP3, [4, "southeast"],
2005 SDLK_KP2, [5, "south"],
2006 SDLK_KP1, [6, "southwest"],
2007 SDLK_KP4, [7, "west"],
2008 SDLK_KP7, [8, "northwest"],
2009
2010 SDLK_UP, [1, "north"],
2011 SDLK_RIGHT, [3, "east"],
2012 SDLK_DOWN, [5, "south"],
2013 SDLK_LEFT, [7, "west"],
2014);
2015
2016sub key_down {
2017 my ($self, $ev) = @_;
2018
2019 my $mod = $ev->key_mod;
2020 my $sym = $ev->key_sym;
2021
2022 if ($sym == SDLK_KP5) {
2023 $::CONN->user_send ("stay fire");
2024 } elsif ($sym == SDLK_a) {
2025 $::CONN->user_send ("apply");
2026 } elsif ($sym == SDLK_QUOTE) {
2027 $self->emit ('activate_console');
2028 } elsif ($sym == SDLK_SLASH) {
2029 $self->emit ('activate_console' => '/');
2030 } elsif (exists $DIR{$sym}) {
2031 if ($mod & KMOD_SHIFT) {
2032 $self->{shft}++;
2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
2034 } elsif ($mod & KMOD_CTRL) {
2035 $self->{ctrl}++;
2036 $::CONN->user_send ("run $DIR{$sym}[0]");
2037 } else {
2038 $::CONN->user_send ("$DIR{$sym}[1]");
2039 }
2040 }
2041}
2042
2043sub key_up {
2044 my ($self, $ev) = @_;
2045
2046 my $mod = $ev->key_mod;
2047 my $sym = $ev->key_sym;
2048
2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2050 $::CONN->user_send ("fire_stop");
2051 }
2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2053 $::CONN->user_send ("run_stop");
2054 }
2055}
2056
2057#############################################################################
2058
2059package CFClient::UI::Animator; 2268package CFClient::UI::Animator;
2060 2269
2061use SDL::OpenGL; 2270use CFClient::OpenGL;
2062 2271
2063our @ISA = CFClient::UI::Bin::; 2272our @ISA = CFClient::UI::Bin::;
2064 2273
2065sub moveto { 2274sub moveto {
2066 my ($self, $x, $y) = @_; 2275 my ($self, $x, $y) = @_;
… …
2104 2313
2105sub new { 2314sub new {
2106 my $class = shift; 2315 my $class = shift;
2107 2316
2108 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2109 state => 0, 2318 state => 0,
2110 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2111 @_ 2320 @_
2112 ); 2321 );
2113 2322
2114 if ($self->{state}) { 2323 if ($self->{state}) {
… …
2135 $self->emit (changed => $self->{state}); 2344 $self->emit (changed => $self->{state});
2136} 2345}
2137 2346
2138############################################################################# 2347#############################################################################
2139 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
2140package CFClient::UI::Root; 2733package CFClient::UI::Root;
2141 2734
2142our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2143 2736
2144use SDL::OpenGL; 2737use CFClient::OpenGL;
2145 2738
2146sub check_size { 2739sub new {
2147 my ($self) = @_; 2740 my $class = shift;
2148 2741
2149 $self->configure (0, 0, $::WITH, $::HEIGHT); 2742 $class->SUPER::new (
2150} 2743 @_,
2151 2744 )
2152sub size_request {
2153 ($::WIDTH, $::HEIGHT)
2154} 2745}
2155 2746
2156sub configure { 2747sub configure {
2157 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2158 2749
2159 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2160 2751 $self->{h} = $h;
2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2162 for @{$self->{children}};
2163} 2752}
2164 2753
2165sub _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 {
2166 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2167 2800
2168 ($x, $y) 2801 ($x, $y)
2169} 2802}
2170 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2171sub update { 2810sub update {
2172 my ($self) = @_; 2811 my ($self) = @_;
2173 2812
2174 $self->check_size; 2813 $self->check_size;
2175 ::refresh (); 2814 $::WANT_REFRESH++;
2176} 2815}
2177 2816
2178sub add { 2817sub add {
2179 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2180 2819
2820 # integerise window positions
2821 $child->{x} = int $child->{x};
2822 $child->{y} = int $child->{y};
2823
2181 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2182} 2825}
2183 2826
2184sub on_refresh { 2827sub on_refresh {
2185 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2186 2829
2187 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2188} 2831}
2189 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2190sub draw { 2839sub draw {
2191 my ($self) = @_; 2840 my ($self) = @_;
2192 2841
2193 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2194 $_->() 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}};
2195 } 2895 }
2196 2896
2197 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2198 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2199 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;
… …
2210############################################################################# 2910#############################################################################
2211 2911
2212package CFClient::UI; 2912package CFClient::UI;
2213 2913
2214$ROOT = new CFClient::UI::Root; 2914$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip;
2215 2916
22161 29171
2217 2918

Diff Legend

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