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.127 by root, Mon Apr 17 21:03:31 2006 UTC vs.
Revision 1.199 by root, Fri May 12 15:45:42 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) = @_;
195
117 $self->{x} = int $x; 196 $self->{x} = int $x;
118 $self->{y} = int $y; 197 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
120}
121 199
122sub needs_redraw { 200 $self->update;
123 0 201}
202
203sub set_size {
204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
124} 210}
125 211
126sub size_request { 212sub size_request {
127 require Carp; 213 require Carp;
128 Carp::confess "size_request is abtract"; 214 Carp::confess "size_request is abstract";
129} 215}
130 216
131sub _size_allocate { 217sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 218 my ($self, $x, $y, $w, $h) = @_;
133 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) {
134 $self->{x} = $x; 233 $self->{x} = $x;
135 $self->{y} = $y; 234 $self->{y} = $y;
235 $self->update;
236 }
136 237
137 return unless $self->{w} != $w || $self->{h} != $h; 238 if ($self->{w} != $w || $self->{h} != $h) {
138 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
139 $self->{w} = $w;
140 $self->{h} = $h;
141
142 1 240 }
143} 241}
144 242
145sub size_allocate { 243sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 244 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 245}
150 246
151# return top left coordinates 247sub children {
152sub _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 {
153 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
154 263
155 $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;
156} 266}
157 267
158# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
159sub coord2local { 269sub coord2local {
160 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
161 271
162 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
163 ($x - $X, $y - $Y)
164} 273}
165 274
166# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
167sub coord2global { 276sub coord2global {
168 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
169 278
170 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
171 ($x + $X, $y + $Y)
172} 280}
173 281
174sub focus_in { 282sub focus_in {
175 my ($self) = @_; 283 my ($self) = @_;
176 284
… …
236 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
237 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
238 glEnd; 346 glEnd;
239 glDisable GL_BLEND; 347 glDisable GL_BLEND;
240 } 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 }
241} 363}
242 364
243sub _draw { 365sub _draw {
244 my ($self) = @_; 366 my ($self) = @_;
245 367
246 warn "no draw defined for $self\n"; 368 warn "no draw defined for $self\n";
247} 369}
248 370
249sub find_widget { 371sub find_widget {
250 my ($self, $x, $y) = @_; 372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
251 375
252 return $self 376 return $self
253 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
255 379
… …
258 382
259sub set_parent { 383sub set_parent {
260 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
261 385
262 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};
263} 391}
264 392
265sub check_size { 393sub check_size {
266 my ($self) = @_; 394 my ($self, $forced) = @_;
267 395
268 my ($w, $h) = $self->size_request; 396 $self->{force_alloc} = 1 if $forced;
269 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
270 if ($w != $self->{req_w} || $h != $self->{req_h}) {
271 $self->{req_w} = $w;
272 $self->{req_h} = $h;
273
274 $self->{parent}->check_size
275 if $self->{parent};
276 }
277} 398}
278 399
279sub update { 400sub update {
280 my ($self) = @_; 401 my ($self) = @_;
281 402
… …
284} 405}
285 406
286sub connect { 407sub connect {
287 my ($self, $signal, $cb) = @_; 408 my ($self, $signal, $cb) = @_;
288 409
289 push @{ $self->{cb}{$signal} }, $cb; 410 push @{ $self->{signal_cb}{$signal} }, $cb;
290} 411}
291 412
292sub emit { 413sub emit {
293 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
294 415
295 $_->($self, @args) 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
296 for @{$self->{cb}{$signal} || []};
297} 417}
298 418
299sub DESTROY { 419sub DESTROY {
300 my ($self) = @_; 420 my ($self) = @_;
301 421
… …
307package CFClient::UI::DrawBG; 427package CFClient::UI::DrawBG;
308 428
309our @ISA = CFClient::UI::Base::; 429our @ISA = CFClient::UI::Base::;
310 430
311use strict; 431use strict;
312use SDL::OpenGL; 432use CFClient::OpenGL;
313 433
314sub new { 434sub new {
315 my $class = shift; 435 my $class = shift;
316 436
317 # range [value, low, high, page] 437 # range [value, low, high, page]
… …
346 466
347package CFClient::UI::Empty; 467package CFClient::UI::Empty;
348 468
349our @ISA = CFClient::UI::Base::; 469our @ISA = CFClient::UI::Base::;
350 470
471sub new {
472 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg);
474}
475
351sub size_request { 476sub size_request {
352 (0, 0) 477 (0, 0)
353} 478}
354 479
355sub draw { } 480sub draw { }
… …
363sub new { 488sub new {
364 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
365 490
366 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
367 492
368 my $self = $class->SUPER::new (children => [], %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
369 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
370 499
371 $self 500 $self
372} 501}
373 502
374sub add { 503sub add {
375 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
376 505
377 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
378 508
379 use sort 'stable'; 509 use sort 'stable';
380 510
381 $self->{children} = [ 511 $self->{children} = [
382 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
383 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
384 ]; 514 ];
385 515
386 $self->{w} = $self->{h} = -1;
387
388 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
389} 522}
390 523
391sub remove { 524sub remove {
392 my ($self, $widget) = @_; 525 my ($self, $child) = @_;
393 526
527 delete $child->{parent};
528 $child->hide;
529
394 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
395 531
396 $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;
397} 549}
398 550
399sub find_widget { 551sub find_widget {
400 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
401 553
… …
431 583
432 $class->SUPER::new (children => [$child], %arg) 584 $class->SUPER::new (children => [$child], %arg)
433} 585}
434 586
435sub add { 587sub add {
436 my ($self, $widget) = @_; 588 my ($self, $child) = @_;
437 589
438 $self->{children} = []; 590 $self->{children} = [];
439 591
440 $self->SUPER::add ($widget); 592 $self->SUPER::add ($child);
441} 593}
442 594
443sub remove { 595sub remove {
444 my ($self, $widget) = @_; 596 my ($self, $widget) = @_;
445 597
… …
454sub size_request { 606sub size_request {
455 $_[0]{children}[0]->size_request 607 $_[0]{children}[0]->size_request
456} 608}
457 609
458sub size_allocate { 610sub size_allocate {
459 my ($self, $x, $y, $w, $h) = @_; 611 my ($self, $w, $h) = @_;
460 612
461 $self->_size_allocate ($x, $y, $w, $h) or return;
462
463 $self->{children}[0]->size_allocate (0, 0, $w, $h); 613 $self->{children}[0]->configure (0, 0, $w, $h);
464} 614}
465 615
466############################################################################# 616#############################################################################
467 617
468package CFClient::UI::Window; 618package CFClient::UI::Window;
469 619
470our @ISA = CFClient::UI::Bin::; 620our @ISA = CFClient::UI::Bin::;
471 621
472use SDL::OpenGL; 622use CFClient::OpenGL;
473 623
474sub new { 624sub new {
475 my ($class, %arg) = @_; 625 my ($class, %arg) = @_;
476 626
477 my $self = $class->SUPER::new (%arg); 627 my $self = $class->SUPER::new (%arg);
478} 628}
479 629
480sub update { 630sub update {
481 my ($self) = @_; 631 my ($self) = @_;
482 632
483 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
484 $self->render_chld;
485 $self->SUPER::update; 634 $self->SUPER::update;
486} 635}
487 636
637sub size_allocate {
638 my ($self, $w, $h) = @_;
639
640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
488sub render_chld { 648sub render_child {
489 my ($self) = @_; 649 my ($self) = @_;
490 650
491 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
492 glClearColor 0, 0, 0, 1; 652 glClearColor 0, 0, 0, 0;
493 glClear GL_COLOR_BUFFER_BIT; 653 glClear GL_COLOR_BUFFER_BIT;
494 $self->child->draw; 654
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;
495 }; 663 };
496}
497
498sub size_allocate {
499 my ($self, $x, $y, $w, $h) = @_;
500
501 $self->_size_allocate ($x, $y, $w, $h) or return;
502
503 $self->child->size_allocate (0, 0, $w, $h);
504
505 $self->render_chld;
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 size_allocate { 698sub size_allocate {
545 my ($self, $x, $y, $w, $h) = @_; 699 my ($self, $w, $h) = @_;
546 700
547 $self->_size_allocate ($x, $y, $w, $h) or return; 701 $self->update;
548} 702}
549 703
550sub _draw { 704sub set_offset {
551 my ($self) = @_; 705 my ($self, $x, $y) = @_;
552 706
553 $self->{children}[1]->draw; 707 $self->{view_x} = int $x;
554} 708 $self->{view_y} = int $y;
555 709
710 $self->update;
711}
556 712
557############################################################################# 713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
558 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)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
559package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
560 752
561our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
562
563use SDL::OpenGL;
564
565sub size_request {
566 my ($self) = @_;
567 my $chld = $self->child
568 or return (0, 0);
569
570 $chld->move (2, 2);
571
572 map { $_ + 4 } $chld->size_request;
573}
574
575sub size_allocate {
576 my ($self, $x, $y, $w, $h) = @_;
577
578 $self->_size_allocate ($x, $y, $w, $h) or return;
579
580 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
581}
582
583sub _draw {
584 my ($self) = @_;
585
586 my $chld = $self->child;
587
588 my ($w, $h) = $chld->size_request;
589
590 glBegin GL_QUADS;
591 glColor 0, 0, 0;
592 glVertex 0 , 0;
593 glVertex 0 , $h + 4;
594 glVertex $w + 4 , $h + 4;
595 glVertex $w + 4 , 0;
596 glEnd;
597
598 $chld->draw;
599}
600
601#############################################################################
602
603package CFClient::UI::FancyFrame;
604
605our @ISA = CFClient::UI::Bin::;
606
607use SDL::OpenGL;
608
609my @tex =
610 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
611 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
612 754
613sub new { 755sub new {
614 my $class = shift; 756 my $class = shift;
615 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
616 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
617 840
618 $class->SUPER::new ( 841 my $self = $class->SUPER::new (
619 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
620 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
621 border => int $::FONTSIZE * 0.8, 844 border => 0.6,
845 can_events => 1,
622 @_ 846 @_
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
860}
861
862sub size_request {
863 my ($self) = @_;
864
865 my ($w, $h) = $self->SUPER::size_request;
866
867 (
868 $w + $self->border * 2,
869 $h + $self->border * 2,
623 ) 870 )
624} 871}
625 872
626sub size_request {
627 my ($self) = @_;
628
629 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
630
631 my ($w, $h) = $self->SUPER::size_request;
632
633 (
634 $w + $self->{border} * 2,
635 $h + $self->{border} * 2,
636 )
637}
638
639sub size_allocate { 873sub size_allocate {
640 my ($self, $x, $y, $w, $h) = @_; 874 my ($self, $w, $h) = @_;
641 875
642 $self->_size_allocate ($x, $y, $w, $h) or return;
643
644 $h -= List::Util::max 0, $self->{border} * 2; 876 $h -= List::Util::max 0, $self->border * 2;
645 $w -= List::Util::max 0, $self->{border} * 2; 877 $w -= List::Util::max 0, $self->border * 2;
646 878
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
880 if $self->{title};
881
647 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 882 $self->child->configure ($self->border, $self->border, $w, $h);
648} 883}
649 884
650sub button_down { 885sub button_down {
651 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
652 887
653 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 888 my ($w, $h) = @$self{qw(w h)};
654 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 889 my $border = $self->border;
655 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});
656 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
657 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;
658 901
659 $self->{motion} = sub { 902 $self->{motion} = sub {
660 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
661 904
662 ($x, $y) = ($ev->motion_x, $ev->motion_y); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
663 907
664 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
665 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
666 $self->update; 910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size;
667 }; 912 };
668 913
669 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
670 && $y >= 0 && $y < $self->{border}) {
671
672 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
673 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
674 917
675 $self->{motion} = sub { 918 $self->{motion} = sub {
676 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
677 920
678 ($x, $y) = ($ev->motion_x, $ev->motion_y); 921 ($x, $y) = ($ev->{x}, $ev->{y});
679 922
680 $self->move ($bx + $x - $ox, $by + $y - $oy); 923 $self->move ($bx + $x - $ox, $by + $y - $oy);
681 $self->update; 924 $self->update;
682 }; 925 };
683 } 926 }
… …
699 my ($self) = @_; 942 my ($self) = @_;
700 943
701 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
702 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
703 946
704 glEnable GL_BLEND;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
708 949
950 my $border = $self->border;
951
709 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
710 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
711 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
712 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
713 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
714 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
715 my $bg = $tex[0]; 959 my $bg = $tex[0];
716 960
717 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
718 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
719 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
720 964
721 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
722 966
723 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
724 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
725 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
726 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
727 972
728 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
729 glDisable GL_BLEND; 974
975 $self->{title}->draw if $self->{title};
730 976
731 $self->child->draw; 977 $self->child->draw;
732} 978}
733 979
734############################################################################# 980#############################################################################
… …
737 983
738our @ISA = CFClient::UI::Base::; 984our @ISA = CFClient::UI::Base::;
739 985
740use List::Util qw(max sum); 986use List::Util qw(max sum);
741 987
742use SDL::OpenGL; 988use CFClient::OpenGL;
743 989
744sub new { 990sub new {
745 my $class = shift; 991 my $class = shift;
746 992
747 $class->SUPER::new ( 993 $class->SUPER::new (
… …
754 my ($self, $x, $y, $child) = @_; 1000 my ($self, $x, $y, $child) = @_;
755 1001
756 $child->set_parent ($self); 1002 $child->set_parent ($self);
757 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
758 1004
759 $self->{w} = $self->{h} = -1;
760
761 $child->check_size; 1005 $child->check_size;
1006}
1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
762} 1010}
763 1011
764# 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?
765sub clear { 1013sub clear {
766 my ($self) = @_; 1014 my ($self) = @_;
767 1015
1016 my @children = $self->children;
768 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
769 $self->update; 1024 $self->update;
770} 1025}
771 1026
772sub get_wh { 1027sub get_wh {
773 my ($self) = @_; 1028 my ($self) = @_;
… …
779 or next; 1034 or next;
780 1035
781 for my $x (0 .. $#$row) { 1036 for my $x (0 .. $#$row) {
782 my $widget = $row->[$x] 1037 my $widget = $row->[$x]
783 or next; 1038 or next;
784 my ($w, $h) = $widget->size_request; 1039 my ($w, $h) = @$widget{qw(req_w req_h)};
785 1040
786 $w[$x] = max $w[$x], $w; 1041 $w[$x] = max $w[$x], $w;
787 $h[$y] = max $h[$y], $h; 1042 $h[$y] = max $h[$y], $h;
788 } 1043 }
789 } 1044 }
… …
801 (sum @$hs), 1056 (sum @$hs),
802 ) 1057 )
803} 1058}
804 1059
805sub size_allocate { 1060sub size_allocate {
806 my ($self, $x, $y, $w, $h) = @_; 1061 my ($self, $w, $h) = @_;
807
808 $self->_size_allocate ($x, $y, $w, $h) or return;
809 1062
810 my ($ws, $hs) = $self->get_wh; 1063 my ($ws, $hs) = $self->get_wh;
811 1064
812 my $req_w = sum @$ws; 1065 my $req_w = sum @$ws;
813 my $req_h = sum @$hs; 1066 my $req_h = sum @$hs;
… …
835 1088
836 for my $c (0 .. $#$row) { 1089 for my $c (0 .. $#$row) {
837 my $col_w = $ws->[$c]; 1090 my $col_w = $ws->[$c];
838 1091
839 if (my $widget = $row->[$c]) { 1092 if (my $widget = $row->[$c]) {
840 $widget->size_allocate ($x, $y, $col_w, $row_h); 1093 $widget->configure ($x, $y, $col_w, $row_h);
841 } 1094 }
842 1095
843 $x += $col_w; 1096 $x += $col_w;
844 } 1097 }
845 1098
… …
890 (List::Util::max map $_->[1], @alloc), 1143 (List::Util::max map $_->[1], @alloc),
891 ) 1144 )
892} 1145}
893 1146
894sub size_allocate { 1147sub size_allocate {
895 my ($self, $x, $y, $w, $h) = @_; 1148 my ($self, $w, $h) = @_;
896
897 $self->_size_allocate ($x, $y, $w, $h) or return;
898 1149
899 ($h, $w) = ($w, $h); 1150 ($h, $w) = ($w, $h);
900 1151
901 my $children = $self->{children}; 1152 my $children = $self->{children};
902 1153
903 my @h = map +($_->size_request)[0], @$children; 1154 my @h = map $_->{req_w}, @$children;
904 1155
905 my $req_h = List::Util::sum @h; 1156 my $req_h = List::Util::sum @h;
906 1157
907 if ($req_h > $h) { 1158 if ($req_h > $h) {
908 # ah well, not enough space 1159 # ah well, not enough space
… …
924 1175
925 my $y = 0; 1176 my $y = 0;
926 for (0 .. $#$children) { 1177 for (0 .. $#$children) {
927 my $child = $children->[$_]; 1178 my $child = $children->[$_];
928 my $h = $h[$_]; 1179 my $h = $h[$_];
929 $child->size_allocate ($y, 0, $h, $w); 1180 $child->configure ($y, 0, $h, $w);
930 1181
931 $y += $h; 1182 $y += $h;
932 } 1183 }
933 1184
934 1 1185 1
… …
952 (List::Util::sum map $_->[1], @alloc), 1203 (List::Util::sum map $_->[1], @alloc),
953 ) 1204 )
954} 1205}
955 1206
956sub size_allocate { 1207sub size_allocate {
957 my ($self, $x, $y, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
958 1209
959 $self->_size_allocate ($x, $y, $w, $h) or return; 1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
960 1211
961 my $children = $self->{children}; 1212 my $children = $self->{children};
962 1213
963 my @h = map +($_->size_request)[1], @$children; 1214 my @h = map $_->{req_h}, @$children;
964 1215
965 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
966 1217
967 if ($req_h > $h) { 1218 if ($req_h > $h) {
968 # ah well, not enough space 1219 # ah well, not enough space
… …
982 1233
983 my $y = 0; 1234 my $y = 0;
984 for (0 .. $#$children) { 1235 for (0 .. $#$children) {
985 my $child = $children->[$_]; 1236 my $child = $children->[$_];
986 my $h = $h[$_]; 1237 my $h = $h[$_];
987 $child->size_allocate (0, $y, $w, $h); 1238 $child->configure (0, $y, $w, $h);
988 1239
989 $y += $h; 1240 $y += $h;
990 } 1241 }
991 1242
992 1 1243 1
… …
996 1247
997package CFClient::UI::Label; 1248package CFClient::UI::Label;
998 1249
999our @ISA = CFClient::UI::Base::; 1250our @ISA = CFClient::UI::Base::;
1000 1251
1001use SDL::OpenGL; 1252use CFClient::OpenGL;
1002 1253
1003sub new { 1254sub new {
1004 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1005 1256
1006 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1007 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1008 fontsize => $::FONTSIZE, 1259 #font => default_font
1009 text => "", 1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1263 fontsize => 1,
1010 align => -1, 1264 align => -1,
1011 valign => -1, 1265 valign => -1,
1012 padding => 2, 1266 padding => 2,
1013 layout => new CFClient::Layout, 1267 can_events => 0,
1014 %arg 1268 %arg
1015 ); 1269 );
1016 1270
1017 $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 }
1018 1276
1019 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1020 $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 }
1021 1282
1022 $self 1283 $self
1023} 1284}
1024 1285
1025sub escape_text { 1286sub escape {
1026 local $_ = $_[1]; 1287 local $_ = $_[1];
1027 1288
1028 s/&/&amp;/g; 1289 s/&/&amp;/g;
1029 s/>/&gt;/g; 1290 s/>/&gt;/g;
1030 s/</&lt;/g; 1291 s/</&lt;/g;
1031 1292
1032 $_[1] 1293 $_[1]
1033} 1294}
1034 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1035sub set_text { 1303sub set_text {
1036 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1037 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;
1038 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1039 1311
1040 delete $self->{texture};
1041 $self->update; 1312 $self->update;
1313 $self->check_size;
1042} 1314}
1043 1315
1044sub set_markup { 1316sub set_markup {
1045 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1046 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;
1047 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1048 1326
1049 delete $self->{texture};
1050 $self->update; 1327 $self->update;
1328 $self->check_size;
1051} 1329}
1052 1330
1053sub size_request { 1331sub size_request {
1054 my ($self) = @_; 1332 my ($self) = @_;
1055 1333
1056 $self->{layout}->set_width; 1334 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1);
1057 $self->{layout}->set_height ($self->{fontsize}); 1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1058 1337
1059 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 }
1060 1349
1061 ( 1350 (
1062 $w + $self->{padding} * 2, 1351 $w + $self->{padding} * 2,
1063 $h + $self->{padding} * 2, 1352 $h + $self->{padding} * 2,
1064 ) 1353 )
1065} 1354}
1066 1355
1067sub size_allocate { 1356sub size_allocate {
1068 my ($self, $x, $y, $w, $h) = @_; 1357 my ($self, $w, $h) = @_;
1069
1070 $self->_size_allocate ($x, $y, $w, $h) or return;
1071 1358
1072 delete $self->{texture}; 1359 delete $self->{texture};
1073} 1360}
1074 1361
1075sub update { 1362sub set_fontsize {
1076 my ($self) = @_; 1363 my ($self, $fontsize) = @_;
1077 1364
1365 $self->{fontsize} = $fontsize;
1078 delete $self->{texture}; 1366 delete $self->{texture};
1367
1079 $self->SUPER::update; 1368 $self->update;
1369 $self->check_size;
1080} 1370}
1081 1371
1082sub _draw { 1372sub _draw {
1083 my ($self) = @_; 1373 my ($self) = @_;
1084 1374
1085 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};
1086 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1087 $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
1088 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
1089 }; 1392 };
1090 1393
1091 glEnable GL_BLEND;
1092 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1093 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1094 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1095 1396
1397 if ($tex->{format} == GL_ALPHA) {
1096 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1097
1098 $self->{ox} = int (
1099 $self->{align} < 0 ? $self->{padding}
1100 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1101 : ($self->{w} - $tex->{w}) * 0.5
1102 );
1103
1104 $self->{oy} = int (
1105 $self->{valign} < 0 ? $self->{padding}
1106 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1107 : ($self->{h} - $tex->{h}) * 0.5
1108 );
1109
1110 $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 }
1111 1403
1112 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1113 glDisable GL_BLEND;
1114} 1405}
1115 1406
1116############################################################################# 1407#############################################################################
1117 1408
1118package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
1119 1410
1120our @ISA = CFClient::UI::Label::; 1411our @ISA = CFClient::UI::Label::;
1121 1412
1122use SDL; 1413use CFClient::OpenGL;
1123use SDL::OpenGL;
1124 1414
1125sub new { 1415sub new {
1126 my $class = shift; 1416 my $class = shift;
1127 1417
1128 $class->SUPER::new ( 1418 $class->SUPER::new (
1129 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1130 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1131 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1132 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1133 can_hover => 1, 1423 can_hover => 1,
1134 can_focus => 1, 1424 can_focus => 1,
1135 valign => 0, 1425 valign => 0,
1426 can_events => 1,
1136 @_ 1427 @_
1137 ) 1428 )
1138} 1429}
1139 1430
1140sub _set_text { 1431sub _set_text {
… …
1142 1433
1143 delete $self->{cur_h}; 1434 delete $self->{cur_h};
1144 1435
1145 return if $self->{text} eq $text; 1436 return if $self->{text} eq $text;
1146 1437
1438 delete $self->{texture};
1439
1147 $self->{last_activity} = $::NOW; 1440 $self->{last_activity} = $::NOW;
1148 $self->{text} = $text; 1441 $self->{text} = $text;
1149 1442
1150 $text =~ s/./*/g if $self->{hidden}; 1443 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1152 1445
1153 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1154} 1447}
1155 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
1156sub get_text { 1458sub get_text {
1157 $_[0]{text} 1459 $_[0]{text}
1158} 1460}
1159 1461
1160sub size_request { 1462sub size_request {
… …
1164 1466
1165 ($w + 1, $h) # add 1 for cursor 1467 ($w + 1, $h) # add 1 for cursor
1166} 1468}
1167 1469
1168sub size_allocate { 1470sub size_allocate {
1169 my ($self, $x, $y, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1170 1472
1171 $self->SUPER::size_allocate ($x, $y, $w, $h) or return; 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1172
1173 $self->_set_text ($self->{text});
1174}
1175
1176sub set_text {
1177 my ($self, $text) = @_;
1178
1179 $self->{cursor} = length $text;
1180 $self->_set_text ($text);
1181 $self->update;
1182} 1474}
1183 1475
1184sub key_down { 1476sub key_down {
1185 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1186 1478
1187 my $mod = $ev->key_mod; 1479 my $mod = $ev->{mod};
1188 my $sym = $ev->key_sym; 1480 my $sym = $ev->{sym};
1189
1190 my $uni = $ev->key_unicode; 1481 my $uni = $ev->{unicode};
1191 1482
1192 my $text = $self->get_text; 1483 my $text = $self->get_text;
1193 1484
1194 if ($sym == SDLK_BACKSPACE) { 1485 if ($sym == 8) {
1195 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1196 } elsif ($sym == SDLK_DELETE) { 1487 } elsif ($sym == 127) {
1197 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1198 } elsif ($sym == SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1199 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1200 } elsif ($sym == SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1201 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1202 } elsif ($sym == SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1203 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1204 } elsif ($sym == SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1205 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1206 } elsif ($sym == SDLK_ESCAPE) { 1497 } elsif ($sym == 27) {
1207 $self->emit ('escape'); 1498 $self->emit ('escape');
1208 } elsif ($uni) { 1499 } elsif ($uni) {
1209 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1210 } 1501 }
1211 1502
… …
1286 1577
1287package CFClient::UI::Entry; 1578package CFClient::UI::Entry;
1288 1579
1289our @ISA = CFClient::UI::EntryBase::; 1580our @ISA = CFClient::UI::EntryBase::;
1290 1581
1291use SDL; 1582use CFClient::OpenGL;
1292use SDL::OpenGL;
1293 1583
1294sub key_down { 1584sub key_down {
1295 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1296 1586
1297 my $sym = $ev->key_sym; 1587 my $sym = $ev->{sym};
1298 1588
1299 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} = '';
1300 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1301 $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 }
1302 1618
1303 } else { 1619 } else {
1304 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1305 } 1621 }
1306 1622
… …
1310 1626
1311package CFClient::UI::Button; 1627package CFClient::UI::Button;
1312 1628
1313our @ISA = CFClient::UI::Label::; 1629our @ISA = CFClient::UI::Label::;
1314 1630
1315use SDL; 1631use CFClient::OpenGL;
1316use SDL::OpenGL;
1317 1632
1318my @tex = 1633my @tex =
1319 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1634 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1320 qw(b1_button_active.png); 1635 qw(b1_button_active.png);
1321 1636
1322sub new { 1637sub new {
1323 my $class = shift; 1638 my $class = shift;
1324 1639
1325 $class->SUPER::new ( 1640 $class->SUPER::new (
1326 padding => 4, 1641 padding => 4,
1327 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1328 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1329 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1330 can_hover => 1, 1645 can_hover => 1,
1331 align => 0, 1646 align => 0,
1332 valign => 0, 1647 valign => 0,
1648 can_events => 1,
1333 @_ 1649 @_
1334 ) 1650 )
1335} 1651}
1336 1652
1337sub button_up { 1653sub button_up {
… …
1350 1666
1351 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1352 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1353 } 1669 }
1354 1670
1355 glEnable GL_BLEND;
1356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1357 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1359 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1360 1674
1361 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1362 1676
1363 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1364 glDisable GL_BLEND;
1365 1678
1366 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1367} 1680}
1368 1681
1369############################################################################# 1682#############################################################################
… …
1371package CFClient::UI::CheckBox; 1684package CFClient::UI::CheckBox;
1372 1685
1373our @ISA = CFClient::UI::DrawBG::; 1686our @ISA = CFClient::UI::DrawBG::;
1374 1687
1375my @tex = 1688my @tex =
1376 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1689 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1377 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1690 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1378 1691
1379use SDL; 1692use CFClient::OpenGL;
1380use SDL::OpenGL;
1381 1693
1382sub new { 1694sub new {
1383 my $class = shift; 1695 my $class = shift;
1384 1696
1385 $class->SUPER::new ( 1697 $class->SUPER::new (
… …
1396 my ($self) = @_; 1708 my ($self) = @_;
1397 1709
1398 ($self->{padding} * 2 + 6) x 2 1710 ($self->{padding} * 2 + 6) x 2
1399} 1711}
1400 1712
1401sub size_allocate {
1402 my ($self, $x, $y, $w, $h) = @_;
1403
1404 $self->_size_allocate ($x, $y, $w, $h) or return;
1405}
1406
1407sub button_down { 1713sub button_down {
1408 my ($self, $ev, $x, $y) = @_; 1714 my ($self, $ev, $x, $y) = @_;
1409 1715
1410 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1411 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1423 1729
1424 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;
1425 1731
1426 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1427 1733
1428 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1429 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431
1432 my $tex = $self->{state} ? $tex[1] : $tex[0];
1433
1434 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1435
1436 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
1437 glDisable GL_BLEND; 1796 glDisable GL_TEXTURE_2D;
1438} 1797}
1439 1798
1440############################################################################# 1799#############################################################################
1441 1800
1442package CFClient::UI::VGauge; 1801package CFClient::UI::VGauge;
1443 1802
1444our @ISA = CFClient::UI::Base::; 1803our @ISA = CFClient::UI::Base::;
1445 1804
1446use SDL::OpenGL; 1805use List::Util qw(min max);
1806
1807use CFClient::OpenGL;
1447 1808
1448my %tex = ( 1809my %tex = (
1449 food => [ 1810 food => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1811 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1451 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1812 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1452 ], 1813 ],
1453 grace => [ 1814 grace => [
1454 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1815 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1455 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/
1456 ], 1817 ],
1457 hp => [ 1818 hp => [
1458 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1459 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1820 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1460 ], 1821 ],
1461 mana => [ 1822 mana => [
1462 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1463 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/
1464 ], 1825 ],
1465); 1826);
1466 1827
1467# eg. VGauge->new (gauge => 'food'), default gauge: food 1828# eg. VGauge->new (gauge => 'food'), default gauge: food
1468sub new { 1829sub new {
1469 my $class = shift; 1830 my $class = shift;
1470 1831
1471 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};
1472 1838
1473 $self 1839 $self
1474} 1840}
1475 1841
1476sub size_request { 1842sub size_request {
1477 my ($self) = @_; 1843 my ($self) = @_;
1478 1844
1479 my $tex = $tex{$self->{gauge}}[0]; 1845 #my $tex = $tex{$self->{type}}[0];
1480
1481 @$tex{qw(w h)} 1846 #@$tex{qw(w h)}
1847 (0, 0)
1482} 1848}
1483 1849
1484sub set_max { 1850sub set_max {
1485 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1486 1852
1853 return if $self->{max_val} == $max;
1854
1487 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1488} 1857}
1489 1858
1490sub set_value { 1859sub set_value {
1491 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1492 1861
1493 $self->set_max ($max) 1862 $self->set_max ($max)
1494 if defined $max; 1863 if defined $max;
1495 1864
1496 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1497 $self->{val} = $val; 1867 $self->{val} = $val;
1498
1499 $self->update; 1868 $self->update;
1500} 1869}
1501 1870
1502sub _draw { 1871sub _draw {
1503 my ($self) = @_; 1872 my ($self) = @_;
1504 1873
1505 my $tex = $tex{$self->{gauge}}; 1874 my $tex = $tex{$self->{type}};
1875 my ($t1, $t2, $t3) = @$tex;
1506 1876
1507 my ($w, $h) = ($self->{w}, $self->{h}); 1877 my ($w, $h) = ($self->{w}, $self->{h});
1508 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
1509 my $ycut = $self->{val} / ($self->{max_val} || 1); 1886 my $ycut = $self->{val} / ($self->{max_val} || 1);
1510 $ycut = 1 if $self->{val} > $self->{max_val};
1511 1887
1512 my $t1 = $tex->[0]; 1888 my $ycut1 = max 0, min 1, $ycut;
1513 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);
1514 1893
1515 glEnable GL_BLEND; 1894 glEnable GL_BLEND;
1516 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1517 glEnable GL_TEXTURE_2D; 1896 glEnable GL_TEXTURE_2D;
1518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1519 1898
1520 my $h1 = $self->{h} - $ycut * $self->{h};
1521 my $h2 = $ycut * $self->{h};
1522
1523 my $yp = 0;
1524
1525 glBindTexture (GL_TEXTURE_2D, $t1->{name}); 1899 glBindTexture GL_TEXTURE_2D, $t1->{name};
1526 glBegin (GL_QUADS); 1900 glBegin GL_QUADS;
1527 glTexCoord (0, 0); glVertex (0 , $yp); 1901 glTexCoord 0 , 0; glVertex 0 , 0;
1528 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1); 1902 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1529 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1); 1903 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1530 glTexCoord (1, 0); glVertex (0 + $w, $yp); 1904 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1531 glEnd (); 1905 glEnd;
1532 1906
1533 $yp += $h1; 1907 my $ycut1 = List::Util::min 1, $ycut;
1534
1535 glBindTexture (GL_TEXTURE_2D, $t2->{name}); 1908 glBindTexture GL_TEXTURE_2D, $t2->{name};
1536 glBegin (GL_QUADS); 1909 glBegin GL_QUADS;
1537 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp); 1910 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1538 glTexCoord (0, 1); glVertex (0 , $yp + $h2); 1911 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1539 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2); 1912 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1540 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp); 1913 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1541 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 }
1542 1925
1543 glDisable GL_BLEND; 1926 glDisable GL_BLEND;
1544 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1545} 1928}
1546 1929
1547############################################################################# 1930#############################################################################
1548 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
1549package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
1550 1980
1551use strict; 1981use strict;
1552 1982
1553use SDL::OpenGL; 1983use CFClient::OpenGL;
1554 1984
1555our @ISA = CFClient::UI::DrawBG::; 1985our @ISA = CFClient::UI::DrawBG::;
1556 1986
1557my @tex = 1987my @tex =
1558 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1568 # TODO: calculations are off 1998 # TODO: calculations are off
1569 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1570 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1571 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1572 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1573 req_w => 40, 2003 req_w => $::WIDTH / 80,
1574 req_h => 13, 2004 req_h => $::WIDTH / 80,
1575 vertical => 0, 2005 vertical => 0,
1576 can_hover => 1, 2006 can_hover => 1,
1577 inner_pad => 5, 2007 inner_pad => 5,
1578 @_ 2008 @_
1579 ); 2009 );
… …
1662 $page ||= 2; 2092 $page ||= 2;
1663 2093
1664 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1665 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1666 2096
1667 glEnable GL_BLEND;
1668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1669 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1671 2099
1672 # draw background 2100 # draw background
1673 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1674 2102
1675 # draw handle 2103 # draw handle
1676 $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);
1677 2105
1678 glDisable GL_BLEND;
1679 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1680} 2107}
1681 2108
1682############################################################################# 2109#############################################################################
1683 2110
1684package CFClient::UI::TextView; 2111package CFClient::UI::TextView;
1685 2112
1686our @ISA = CFClient::UI::HBox::; 2113our @ISA = CFClient::UI::HBox::;
1687 2114
1688use SDL::OpenGL; 2115use CFClient::OpenGL;
1689 2116
1690sub new { 2117sub new {
1691 my $class = shift; 2118 my $class = shift;
1692 2119
1693 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1694 req_w => $::WIDTH / 6, 2121 fontsize => 1,
1695 req_h => $::HEIGHT / 6, 2122 can_events => 0,
1696 fontsize => $::FONTSIZE, 2123 #font => default_font
1697 @_, 2124 @_,
1698 2125
1699 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1700 par => [], 2127 par => [],
1701 height => 0, 2128 height => 0,
1702 children => [ 2129 children => [
1703 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1704 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1705 ], 2132 ],
1706 ); 2133 );
1707 2134
1708 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1709 $self->update;
1710 });
1711 2136
1712 $self 2137 $self
1713} 2138}
1714 2139
1715sub set_fontsize { 2140sub set_fontsize {
… …
1722sub text_height { 2147sub text_height {
1723 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1724 2149
1725 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1726 2151
1727 $layout->set_height ($self->{fontsize}); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1728 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1729 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1730 2155
1731 ($layout->size)[1] 2156 ($layout->size)[1]
1732} 2157}
1733 2158
1734sub reflow { 2159sub reflow {
… …
1736 2161
1737 $self->{need_reflow}++; 2162 $self->{need_reflow}++;
1738 $self->update; 2163 $self->update;
1739} 2164}
1740 2165
1741sub size_request {
1742 my ($self) = @_;
1743
1744 ($self->{req_w}, $self->{req_h})
1745}
1746
1747sub size_allocate { 2166sub size_allocate {
1748 my ($self, $x, $y, $w, $h) = @_; 2167 my ($self, $w, $h) = @_;
1749 2168
1750 $self->SUPER::size_allocate ($x, $y, $w, $h) or return; 2169 $self->SUPER::size_allocate ($w, $h);
1751 2170
2171 $self->{layout}->set_font ($self->{font}) if $self->{font};
1752 $self->{layout}->set_height ($self->{fontsize}); 2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1753 $self->{layout}->set_width ($self->{w}); 2173 $self->{layout}->set_width ($self->{children}[0]{w});
1754 2174
1755 $self->reflow; 2175 $self->reflow;
1756 $self->update;
1757} 2176}
1758 2177
1759sub add_paragraph { 2178sub add_paragraph {
1760 my ($self, $color, $text) = @_; 2179 my ($self, $color, $text) = @_;
1761 2180
… …
1778 2197
1779 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
1780 2199
1781 delete $self->{texture}; 2200 delete $self->{texture};
1782 2201
1783 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
1784 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
1785 my $height = 0; 2204 my $height = 0;
1786 2205
1787 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
1788 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
1792 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1793 2212
1794 delete $self->{texture}; 2213 delete $self->{texture};
1795 } 2214 }
1796 2215
1797 $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 {
1798 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
1799 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
1800 2219
1801 glEnable GL_BLEND;
1802 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1803 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1804 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1805 2222
1806 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
1807 2224
… …
1810 2227
1811 my $y = 0; 2228 my $y = 0;
1812 2229
1813 my $layout = $self->{layout}; 2230 my $layout = $self->{layout};
1814 2231
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
1815 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
1816 my $h = $par->[0]; 2235 my $h = $par->[0];
1817 2236
1818 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
1819 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
1820 2240
1821 glColor @{ $par->[1] };
1822 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
1823 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);
1824 } 2243 }
1825 2244
1826 $y += $h; 2245 $y += $h;
1827 } 2246 }
1828 2247
1829 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
1830 glDisable GL_BLEND;
1831 }; 2249 };
1832 }); 2250 });
1833} 2251}
1834 2252
1835sub _draw { 2253sub _draw {
1836 my ($self) = @_; 2254 my ($self) = @_;
1837 2255
1838 if ($self->{texture}) {
1839 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 $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});
1842 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
1843 }
1844 2261
1845 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
1846 2263
1847} 2264}
1848 2265
1849############################################################################# 2266#############################################################################
1850 2267
1851package CFClient::UI::MapWidget;
1852
1853use strict;
1854
1855use List::Util qw(min max);
1856
1857use SDL;
1858use SDL::OpenGL;
1859
1860our @ISA = CFClient::UI::Base::;
1861
1862sub new {
1863 my $class = shift;
1864
1865 $class->SUPER::new (
1866 z => -1,
1867 can_focus => 1,
1868 list => (glGenLists 1),
1869 @_
1870 )
1871}
1872
1873sub key_down {
1874 print "MAPKEYDOWN\n";
1875}
1876
1877sub key_up {
1878}
1879
1880sub button_down {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->focus_in;
1884
1885 if ($ev->button == 2) {
1886 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1887 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1888
1889 $self->{motion} = sub {
1890 my ($ev, $x, $y) = @_;
1891
1892 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1893
1894 $::CFG->{map_shift_x} = $bw + $x - $ox;
1895 $::CFG->{map_shift_y} = $bh + $y - $oy;
1896
1897 $self->update;
1898 };
1899 }
1900}
1901
1902sub button_up {
1903 my ($self, $ev, $x, $y) = @_;
1904
1905 delete $self->{motion};
1906}
1907
1908sub mouse_motion {
1909 my ($self, $ev, $x, $y) = @_;
1910
1911 $self->{motion}->($ev, $x, $y) if $self->{motion};
1912}
1913
1914sub size_request {
1915 (
1916 1 + 32 * int $::WIDTH / 32,
1917 1 + 32 * int $::HEIGHT / 32,
1918 )
1919}
1920
1921sub update {
1922 my ($self) = @_;
1923
1924 $self->{need_update} = 1;
1925 $self->SUPER::update;
1926}
1927
1928sub draw {
1929 my ($self) = @_;
1930
1931 if (delete $self->{need_update}) {
1932 glNewList $self->{list}, GL_COMPILE;
1933
1934 if ($::MAP) {
1935 my $sw = int $::WIDTH / 32;
1936 my $sh = int $::HEIGHT / 32;
1937
1938 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1939 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1940
1941 glTranslate $sx0 - 32, $sy0 - 32, 0;
1942
1943 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1944
1945 if ($::CFG->{fow_enable}) {
1946 if ($::CFG->{fow_smooth}) { # smooth fog of war
1947 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1948 glConvolutionFilter2D
1949 GL_CONVOLUTION_2D,
1950 GL_ALPHA,
1951 3, 3,
1952 GL_ALPHA, GL_FLOAT,
1953 pack "f*",
1954 0.1, 0.1, 0.1,
1955 0.1, 0.2, 0.1,
1956 0.1, 0.1, 0.1,
1957 ;
1958 glEnable GL_CONVOLUTION_2D;
1959 }
1960
1961 $self->{fow_texture} = new CFClient::Texture
1962 w => $w,
1963 h => $h,
1964 data => $data,
1965 internalformat => GL_ALPHA,
1966 format => GL_ALPHA;
1967
1968 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1969
1970 glEnable GL_BLEND;
1971 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1972 glEnable GL_TEXTURE_2D;
1973 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1974
1975 glColor +($::CFG->{fow_intensity}) x 3, 1;
1976 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1977
1978 glDisable GL_TEXTURE_2D;
1979 glDisable GL_BLEND;
1980 }
1981
1982 # HACK BEGIN
1983 {
1984 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1985 my ($w, $h) = (250, 250);
1986
1987 glEnable GL_BLEND;
1988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1989 glEnable GL_TEXTURE_2D;
1990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1991
1992 $self->{mapmap_texture} =
1993 new CFClient::Texture
1994 w => $w,
1995 h => $h,
1996 data => $::MAP->mapmap ($w, $h),
1997 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1998
1999 $self->{mapmap_texture}->draw_quad (100, 100);
2000
2001 glDisable GL_TEXTURE_2D;
2002 glDisable GL_BLEND;
2003 }
2004 # HACK END
2005 }
2006
2007 glEndList;
2008 }
2009
2010 glPushMatrix;
2011 glCallList $self->{list};
2012 glPopMatrix;
2013
2014 if ($FOCUS != $self) {
2015 glColor 64/255, 64/255, 64/255;
2016 glLogicOp GL_AND;
2017 glEnable GL_COLOR_LOGIC_OP;
2018 glBegin GL_QUADS;
2019 glVertex 0, 0;
2020 glVertex 0, $::HEIGHT;
2021 glVertex $::WIDTH, $::HEIGHT;
2022 glVertex $::WIDTH, 0;
2023 glEnd;
2024 glDisable GL_COLOR_LOGIC_OP;
2025 }
2026}
2027
2028my %DIR = (
2029 SDLK_KP8, [1, "north"],
2030 SDLK_KP9, [2, "northeast"],
2031 SDLK_KP6, [3, "east"],
2032 SDLK_KP3, [4, "southeast"],
2033 SDLK_KP2, [5, "south"],
2034 SDLK_KP1, [6, "southwest"],
2035 SDLK_KP4, [7, "west"],
2036 SDLK_KP7, [8, "northwest"],
2037
2038 SDLK_UP, [1, "north"],
2039 SDLK_RIGHT, [3, "east"],
2040 SDLK_DOWN, [5, "south"],
2041 SDLK_LEFT, [7, "west"],
2042);
2043
2044sub key_down {
2045 my ($self, $ev) = @_;
2046
2047 my $mod = $ev->key_mod;
2048 my $sym = $ev->key_sym;
2049
2050 if ($sym == SDLK_KP5) {
2051 $::CONN->user_send ("stay fire");
2052 } elsif ($sym == SDLK_a) {
2053 $::CONN->user_send ("apply");
2054 } elsif ($sym == SDLK_QUOTE) {
2055 $self->emit ('activate_console');
2056 } elsif ($sym == SDLK_SLASH) {
2057 $self->emit ('activate_console' => '/');
2058 } elsif (exists $DIR{$sym}) {
2059 if ($mod & KMOD_SHIFT) {
2060 $self->{shft}++;
2061 $::CONN->user_send ("fire $DIR{$sym}[0]");
2062 } elsif ($mod & KMOD_CTRL) {
2063 $self->{ctrl}++;
2064 $::CONN->user_send ("run $DIR{$sym}[0]");
2065 } else {
2066 $::CONN->user_send ("$DIR{$sym}[1]");
2067 }
2068 }
2069}
2070
2071sub key_up {
2072 my ($self, $ev) = @_;
2073
2074 my $mod = $ev->key_mod;
2075 my $sym = $ev->key_sym;
2076
2077 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2078 $::CONN->user_send ("fire_stop");
2079 }
2080 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2081 $::CONN->user_send ("run_stop");
2082 }
2083}
2084
2085#############################################################################
2086
2087package CFClient::UI::Animator; 2268package CFClient::UI::Animator;
2088 2269
2089use SDL::OpenGL; 2270use CFClient::OpenGL;
2090 2271
2091our @ISA = CFClient::UI::Bin::; 2272our @ISA = CFClient::UI::Bin::;
2092 2273
2093sub moveto { 2274sub moveto {
2094 my ($self, $x, $y) = @_; 2275 my ($self, $x, $y) = @_;
… …
2132 2313
2133sub new { 2314sub new {
2134 my $class = shift; 2315 my $class = shift;
2135 2316
2136 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2137 state => 0, 2318 state => 0,
2138 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2139 @_ 2320 @_
2140 ); 2321 );
2141 2322
2142 if ($self->{state}) { 2323 if ($self->{state}) {
… …
2163 $self->emit (changed => $self->{state}); 2344 $self->emit (changed => $self->{state});
2164} 2345}
2165 2346
2166############################################################################# 2347#############################################################################
2167 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 { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Menu;
2566
2567our @ISA = CFClient::UI::FancyFrame::;
2568
2569use CFClient::OpenGL;
2570
2571sub new {
2572 my $class = shift;
2573
2574 my $self = $class->SUPER::new (
2575 items => [],
2576 z => 100,
2577 @_,
2578 );
2579
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2581
2582 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item;
2584
2585 # handle various types of items, only text for now
2586 if (!ref $widget) {
2587 $widget = new CFClient::UI::Label
2588 can_hover => 1,
2589 can_events => 1,
2590 text => $widget;
2591 }
2592
2593 $self->{item}{$widget} = $item;
2594
2595 $self->{vbox}->add ($widget);
2596 }
2597
2598 $self
2599}
2600
2601# popup given the event (must be a mouse button down event currently)
2602sub popup {
2603 my ($self, $ev) = @_;
2604
2605 $self->emit ("popdown");
2606
2607 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self;
2609 $self->{button} = $ev->{button};
2610
2611 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613}
2614
2615sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_;
2617
2618 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER};
2621}
2622
2623sub button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB;
2628 $self->hide;
2629
2630 $self->emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover};
2632 }
2633}
2634
2635#############################################################################
2636
2637package CFClient::UI::Statusbox;
2638
2639our @ISA = CFClient::UI::VBox::;
2640
2641sub reorder {
2642 my ($self) = @_;
2643 my $NOW = time;
2644
2645 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 }
2648
2649 my @widgets;
2650
2651 my @items = sort {
2652 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} };
2655
2656 my $count = 10 + 1;
2657 for my $item (@items) {
2658 last unless --$count;
2659
2660 push @widgets, $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text};
2665
2666 for ($short) {
2667 s/^\s+//;
2668 s/\012.*/…/s;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 }
2672
2673 new CFClient::UI::Label
2674 markup => $short,
2675 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize},
2679 color => $item->{color},
2680 can_events => 1,
2681 can_hover => 1
2682 };
2683 }
2684
2685 $self->clear;
2686 $self->SUPER::add (reverse @widgets);
2687}
2688
2689sub add {
2690 my ($self, $text, %arg) = @_;
2691
2692 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//;
2694
2695 my $timeout = time + ((delete $arg{timeout}) || 60);
2696
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698
2699 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) {
2701 $item->{count}++;
2702 } else {
2703 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text;
2705 }
2706 $item->{id} = ++$self->{id};
2707 $item->{timeout} = $timeout;
2708 delete $item->{label};
2709 } else {
2710 $self->{item}{$group} = {
2711 id => ++$self->{id},
2712 text => $text,
2713 timeout => $timeout,
2714 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0,
2718 count => 1,
2719 %arg,
2720 };
2721 }
2722
2723 $self->reorder;
2724}
2725
2726#############################################################################
2727
2168package CFClient::UI::Root; 2728package CFClient::UI::Root;
2169 2729
2170our @ISA = CFClient::UI::Container::; 2730our @ISA = CFClient::UI::Container::;
2171 2731
2172use SDL::OpenGL; 2732use CFClient::OpenGL;
2733
2734sub new {
2735 my $class = shift;
2736
2737 $class->SUPER::new (
2738 @_,
2739 )
2740}
2741
2742sub configure {
2743 my ($self, $x, $y, $w, $h) = @_;
2744
2745 $self->{w} = $w;
2746 $self->{h} = $h;
2747}
2173 2748
2174sub check_size { 2749sub check_size {
2175 my ($self) = @_; 2750 my ($self) = @_;
2176 2751
2177 $self->size_allocate (0, 0, $::WITH, $::HEIGHT); 2752 $self->size_allocate ($self->{w}, $self->{h})
2753 if $self->{w};
2178} 2754}
2179 2755
2180sub size_request { 2756sub size_request {
2181 ($::WIDTH, $::HEIGHT) 2757 my ($self) = @_;
2758
2759 ($self->{w}, $self->{h})
2182} 2760}
2183 2761
2184sub size_allocate { 2762sub size_allocate {
2185 my ($self, $x, $y, $w, $h) = @_; 2763 my ($self, $w, $h) = @_;
2186 2764
2187 $self->_size_allocate ($x, $y, $w, $h); 2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2188 2767
2189 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2768 if ($old_w && $old_h) {
2190 for @{$self->{children}}; 2769 for my $child ($self->children) {
2191} 2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2192 2780
2193sub _topleft { 2781 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2786 $child->configure ($X, $Y, $W, $H);
2787 }
2788
2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791}
2792
2793sub coord2local {
2194 my ($self, $x, $y) = @_; 2794 my ($self, $x, $y) = @_;
2195 2795
2196 ($x, $y) 2796 ($x, $y)
2197} 2797}
2198 2798
2799sub coord2global {
2800 my ($self, $x, $y) = @_;
2801
2802 ($x, $y)
2803}
2804
2199sub update { 2805sub update {
2200 my ($self) = @_; 2806 my ($self) = @_;
2201 2807
2202 $self->check_size; 2808 $self->check_size;
2203 ::refresh (); 2809 $::WANT_REFRESH++;
2204} 2810}
2205 2811
2206sub add { 2812sub add {
2207 my ($self, $widget) = @_; 2813 my ($self, $child) = @_;
2208 2814
2815 # integerise window positions
2816 $child->{x} = int $child->{x};
2817 $child->{y} = int $child->{y};
2818
2209 $self->SUPER::add ($widget); 2819 $self->SUPER::add ($child);
2210
2211 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2212} 2820}
2213 2821
2214sub on_refresh { 2822sub on_refresh {
2215 my ($self, $id, $cb) = @_; 2823 my ($self, $id, $cb) = @_;
2216 2824
2217 $self->{refresh_hook}{$id} = $cb; 2825 $self->{refresh_hook}{$id} = $cb;
2218} 2826}
2219 2827
2828sub on_post_alloc {
2829 my ($self, $id, $cb) = @_;
2830
2831 $self->{post_alloc_hook}{$id} = $cb;
2832}
2833
2220sub draw { 2834sub draw {
2221 my ($self) = @_; 2835 my ($self) = @_;
2222 2836
2223 while (my $rcb = delete $self->{refresh_hook}) { 2837 while ($self->{refresh_hook}) {
2224 $_->() for values %$rcb; 2838 $_->()
2839 for values %{delete $self->{refresh_hook}};
2840 }
2841
2842 if ($self->{check_size}) {
2843 my @queue = ([], []);
2844
2845 for (;;) {
2846 if ($self->{check_size}) {
2847 # heuristic: check containers last
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2849 for values %{delete $self->{check_size}}
2850 }
2851
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2853
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2855 ? @$widget{qw(user_w user_h)}
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861
2862 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h;
2864
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2866
2867 $widget->{parent}->check_size
2868 if $widget->{parent};
2869 }
2870 }
2871 }
2872
2873 while ($self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) {
2875 my ($widget, $w, $h) = @$_;
2876
2877 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0;
2879
2880 $widget->{w} = $w;
2881 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h);
2883 $widget->emit (size_allocate => $w, $h);
2884 }
2885 }
2886
2887 while ($self->{post_alloc_hook}) {
2888 $_->()
2889 for values %{delete $self->{post_alloc_hook}};
2225 } 2890 }
2226 2891
2227 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2892 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2228 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2229 glClear GL_COLOR_BUFFER_BIT; 2894 glClear GL_COLOR_BUFFER_BIT;
… …
2240############################################################################# 2905#############################################################################
2241 2906
2242package CFClient::UI; 2907package CFClient::UI;
2243 2908
2244$ROOT = new CFClient::UI::Root; 2909$ROOT = new CFClient::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip;
2245 2911
22461 29121
2247 2913

Diff Legend

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