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.109 by root, Sat Apr 15 01:13:47 2006 UTC vs.
Revision 1.153 by root, Sun Apr 23 02:14:33 2006 UTC

7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23 $TOOLTIP->set_text ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show;
26 }
27
28 return;
29 }
30 }
31 }
32
33 $TOOLTIP->hide;
34 delete $TOOLTIP->{owner};
35}
14 36
15# class methods for events 37# class methods for events
16sub feed_sdl_key_down_event { 38sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 39 $FOCUS->key_down ($_[0]) if $FOCUS;
18} 40}
21 $FOCUS->key_up ($_[0]) if $FOCUS; 43 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 44}
23 45
24sub feed_sdl_button_down_event { 46sub feed_sdl_button_down_event {
25 my ($ev) = @_; 47 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 48 my ($x, $y) = ($ev->{x}, $ev->{y});
27 49
28 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 51 my $widget = $ROOT->find_widget ($x, $y);
30 52
31 $GRAB = $widget; 53 $GRAB = $widget;
32 $GRAB->update if $GRAB; 54 $GRAB->update if $GRAB;
33 }
34 55
56 check_tooltip;
57 }
58
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 59 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 60
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 62}
39 63
40sub feed_sdl_button_up_event { 64sub feed_sdl_button_up_event {
41 my ($ev) = @_; 65 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
43 67
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 68 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 69
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 71
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 73
50 if (!$BUTTON_STATE) { 74 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 75 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 76 $grab->update if $grab;
53 $GRAB->update if $GRAB; 77 $GRAB->update if $GRAB;
78
79 check_tooltip;
54 } 80 }
55} 81}
56 82
57sub feed_sdl_motion_event { 83sub feed_sdl_motion_event {
58 my ($ev) = @_; 84 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
60 86
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 88
63 if ($widget != $HOVER) { 89 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
65 91
66 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 94
95 check_tooltip;
96 }
97
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
99}
100
101# convert position array to integers
102sub harmonize {
103 my ($vals) = @_;
104
105 my $rem = 0;
106
107 for (@$vals) {
108 my $i = int $_ + $rem;
109 $rem += $_ - $i;
110 $_ = $i;
111 }
71} 112}
72 113
73############################################################################# 114#############################################################################
74 115
75package CFClient::UI::Base; 116package CFClient::UI::Base;
76 117
77use strict; 118use strict;
78 119
79use SDL::OpenGL; 120use CFClient::OpenGL;
80 121
81sub new { 122sub new {
82 my $class = shift; 123 my $class = shift;
83 124
84 my $self = bless { 125 my $self = bless {
85 x => 0, 126 x => 0,
86 y => 0, 127 y => 0,
87 z => 0, 128 z => 0,
88 w => -1, 129 can_events => 1,
89 h => -1,
90 @_ 130 @_
91 }, $class; 131 }, $class;
92 132
93 for (keys %$self) { 133 for (keys %$self) {
94 if (/^connect_(.*)$/) { 134 if (/^connect_(.*)$/) {
97 } 137 }
98 138
99 $self 139 $self
100} 140}
101 141
142sub show {
143 my ($self) = @_;
144
145 return if $self->{parent};
146
147 $CFClient::UI::ROOT->add ($self);
148}
149
150sub hide {
151 my ($self) = @_;
152
153 return unless $self->{parent};
154
155 $self->{parent}->remove ($self);
156}
157
102sub move { 158sub move {
103 my ($self, $x, $y, $z) = @_; 159 my ($self, $x, $y, $z) = @_;
160
104 $self->{x} = $x; 161 $self->{x} = int $x;
105 $self->{y} = $y; 162 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 163 $self->{z} = $z if defined $z;
164
165 $self->update;
107} 166}
108 167
109sub needs_redraw { 168sub needs_redraw {
110 0 169 0
111} 170}
112 171
113sub size_request { 172sub size_request {
114 require Carp; 173 require Carp;
115 Carp::confess "size_request is abtract"; 174 Carp::confess "size_request is abstract";
116} 175}
117 176
118sub _size_allocate { 177sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 178 my ($self, $x, $y, $w, $h) = @_;
120 179
180 if ($self->{aspect}) {
181 my $w2 = List::Util::min $w, int $h * $self->{aspect};
182 my $h2 = List::Util::min $h, int $w / $self->{aspect};
183
184 # use alignment to adjust x, y
185
186 $x += int +($w - $w2) * 0.5;
187 $y += int +($h - $h2) * 0.5;
188
189 ($w, $h) = ($w2, $h2);
190 }
191
192 if ($self->{x} != $x || $self->{y} != $y) {
121 $self->{x} = $x; 193 $self->{x} = $x;
122 $self->{y} = $y; 194 $self->{y} = $y;
195 $self->update;
196 }
123 197
124 return unless $self->{w} != $w || $self->{h} != $h; 198 if ($self->{w} != $w || $self->{h} != $h) {
125
126 $self->{w} = $w; 199 $self->{w} = $w;
127 $self->{h} = $h; 200 $self->{h} = $h;
128 201
202 $self->size_allocate ($w, $h);
203 $self->update;
129 1 204 }
130} 205}
131 206
132sub size_allocate { 207sub size_allocate {
208 # nothing to be done
209}
210
211# return top left coordinates
212sub _topleft {
133 my ($self, $x, $y, $w, $h) = @_; 213 my ($self, $x, $y) = @_;
134 214
135 $self->_size_allocate ($x, $y, $w, $h); 215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 216}
137 217
138# translate global coordinates to local coordinate system 218# translate global coordinates to local coordinate system
139sub translate { 219sub coord2local {
140 my ($self, $x, $y) = @_; 220 my ($self, $x, $y) = @_;
141 221
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 222 my ($X, $Y) = $self->_topleft;
223 ($x - $X, $y - $Y)
224}
225
226# translate local coordinates to global coordinate system
227sub coord2global {
228 my ($self, $x, $y) = @_;
229
230 my ($X, $Y) = $self->_topleft;
231 ($x + $X, $y + $Y)
143} 232}
144 233
145sub focus_in { 234sub focus_in {
146 my ($self) = @_; 235 my ($self) = @_;
147 236
148 return if $FOCUS == $self; 237 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 238 return unless $self->{can_focus};
150 239
151 my $focus = $FOCUS; $FOCUS = $self; 240 my $focus = $FOCUS; $FOCUS = $self;
241
242 $self->emit (focus_in => $focus);
243
152 $focus->update if $focus; 244 $focus->update if $focus;
153 $FOCUS->update; 245 $FOCUS->update;
154} 246}
155 247
156sub focus_out { 248sub focus_out {
157 my ($self) = @_; 249 my ($self) = @_;
158 250
159 return unless $FOCUS == $self; 251 return unless $FOCUS == $self;
160 252
161 my $focus = $FOCUS; undef $FOCUS; 253 my $focus = $FOCUS; undef $FOCUS;
254
255 $self->emit (focus_out => $focus);
256
162 $focus->update if $focus; #? 257 $focus->update if $focus; #?
163} 258}
164 259
165sub mouse_motion { } 260sub mouse_motion { }
166sub button_up { } 261sub button_up { }
190 glPopMatrix; 285 glPopMatrix;
191 286
192 if ($self == $HOVER && $self->{can_hover}) { 287 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 288 my ($x, $y) = @$self{qw(x y)};
194 289
195 glColor 0, 0, 1, 0.2; 290 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 291 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 293 glBegin GL_QUADS;
199 glVertex $x , $y; 294 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 295 glVertex $x + $self->{w}, $y;
212} 307}
213 308
214sub find_widget { 309sub find_widget {
215 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
216 311
312 return () unless $self->{can_events};
313
217 return $self 314 return $self
218 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 315 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
219 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 316 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
220 317
221 () 318 ()
222} 319}
223 320
224sub set_parent { 321sub set_parent {
225 my ($self, $par) = @_; 322 my ($self, $parent) = @_;
226 323
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 324 Scalar::Util::weaken ($self->{parent} = $parent);
229} 325}
230 326
231sub get_parent { 327sub check_size {
232 $_[0]->{parent} 328 my ($self) = @_;
329
330 return unless $self->{parent};
331
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
233} 340}
234 341
235sub update { 342sub update {
236 my ($self) = @_; 343 my ($self) = @_;
237 344
240} 347}
241 348
242sub connect { 349sub connect {
243 my ($self, $signal, $cb) = @_; 350 my ($self, $signal, $cb) = @_;
244 351
245 push @{ $self->{cb}{$signal} }, $cb; 352 push @{ $self->{signal_cb}{$signal} }, $cb;
246} 353}
247 354
248sub emit { 355sub emit {
249 my ($self, $signal, @args) = @_; 356 my ($self, $signal, @args) = @_;
250 357
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
251 $_->($self, @args) 359 $cb->($self, @args);
252 for @{$self->{cb}{$signal} || []}; 360 }
253} 361}
254 362
255sub DESTROY { 363sub DESTROY {
256 my ($self) = @_; 364 my ($self) = @_;
257 365
263package CFClient::UI::DrawBG; 371package CFClient::UI::DrawBG;
264 372
265our @ISA = CFClient::UI::Base::; 373our @ISA = CFClient::UI::Base::;
266 374
267use strict; 375use strict;
268use SDL::OpenGL; 376use CFClient::OpenGL;
269 377
270sub new { 378sub new {
271 my $class = shift; 379 my $class = shift;
272 380
273 # range [value, low, high, page] 381 # range [value, low, high, page]
302 410
303package CFClient::UI::Empty; 411package CFClient::UI::Empty;
304 412
305our @ISA = CFClient::UI::Base::; 413our @ISA = CFClient::UI::Base::;
306 414
415sub new {
416 my ($class, %arg) = @_;
417 $class->SUPER::new (can_events => 0, %arg);
418}
419
307sub size_request { 420sub size_request {
308 (0, 0) 421 (0, 0)
309} 422}
310 423
311sub draw { } 424sub draw { }
319sub new { 432sub new {
320 my ($class, %arg) = @_; 433 my ($class, %arg) = @_;
321 434
322 my $children = delete $arg{children} || []; 435 my $children = delete $arg{children} || [];
323 436
324 my $self = $class->SUPER::new (children => [], %arg); 437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
325 $self->add ($_) for @$children; 438 $self->add ($_) for @$children;
326 439
327 $self 440 $self
328} 441}
329 442
330sub add { 443sub add {
331 my ($self, $chld) = @_; 444 my ($self, $child) = @_;
332 445
333 $chld->set_parent ($self); 446 $child->set_parent ($self);
447
448 use sort 'stable';
334 449
335 $self->{children} = [ 450 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 451 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 452 @{$self->{children}}, $child
338 ]; 453 ];
339 454
340 $self->{w} = $self->{h} = -1; 455 $child->check_size;
456}
457
458sub remove {
459 my ($self, $child) = @_;
460
461 delete $child->{parent};
462
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464
465 $self->check_size;
341 $self->update; 466 $self->update;
342}
343
344sub remove {
345 my ($self, $widget) = @_;
346
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348
349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
350} 467}
351 468
352sub find_widget { 469sub find_widget {
353 my ($self, $x, $y) = @_; 470 my ($self, $x, $y) = @_;
354 471
384 501
385 $class->SUPER::new (children => [$child], %arg) 502 $class->SUPER::new (children => [$child], %arg)
386} 503}
387 504
388sub add { 505sub add {
389 my ($self, $widget) = @_; 506 my ($self, $child) = @_;
390 507
391 $self->{children} = []; 508 $self->{children} = [];
392 509
393 $self->SUPER::add ($widget); 510 $self->SUPER::add ($child);
394} 511}
395 512
396sub remove { 513sub remove {
397 my ($self, $widget) = @_; 514 my ($self, $widget) = @_;
398 515
407sub size_request { 524sub size_request {
408 $_[0]{children}[0]->size_request 525 $_[0]{children}[0]->size_request
409} 526}
410 527
411sub size_allocate { 528sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 529 my ($self, $w, $h) = @_;
413 530
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 531 $self->{children}[0]->configure (0, 0, $w, $h);
417} 532}
418 533
419############################################################################# 534#############################################################################
420 535
421package CFClient::UI::Window; 536package CFClient::UI::Window;
422 537
423our @ISA = CFClient::UI::Bin::; 538our @ISA = CFClient::UI::Bin::;
424 539
425use SDL::OpenGL; 540use CFClient::OpenGL;
426 541
427sub new { 542sub new {
428 my ($class, %arg) = @_; 543 my ($class, %arg) = @_;
429 544
430 my $self = $class->SUPER::new (%arg); 545 my $self = $class->SUPER::new (%arg);
447 $self->child->draw; 562 $self->child->draw;
448 }; 563 };
449} 564}
450 565
451sub size_allocate { 566sub size_allocate {
452 my ($self, $x, $y, $w, $h) = @_; 567 my ($self, $w, $h) = @_;
453 568
454 $self->_size_allocate ($x, $y, $w, $h) or return;
455
456 $self->child->size_allocate (0, 0, $w, $h); 569 $self->child->configure (0, 0, $w, $h);
457 570
458 $self->render_chld; 571 $self->render_chld;
459} 572}
460 573
461sub _draw { 574sub _draw {
477 glDisable GL_TEXTURE_2D; 590 glDisable GL_TEXTURE_2D;
478} 591}
479 592
480############################################################################# 593#############################################################################
481 594
595package CFClient::UI::ViewPort;
596
597our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
482package CFClient::UI::Frame; 619package CFClient::UI::Frame;
483 620
484our @ISA = CFClient::UI::Bin::; 621our @ISA = CFClient::UI::Bin::;
485 622
486use SDL::OpenGL; 623use CFClient::OpenGL;
487
488sub size_request {
489 my ($self) = @_;
490 my $chld = $self->child
491 or return (0, 0);
492
493 $chld->move (2, 2);
494
495 map { $_ + 4 } $chld->size_request;
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 (2, 2, $w - 4, $h - 4);
504}
505
506sub _draw {
507 my ($self) = @_;
508
509 my $chld = $self->child;
510
511 my ($w, $h) = $chld->size_request;
512
513 glBegin GL_QUADS;
514 glColor 0, 0, 0;
515 glVertex 0 , 0;
516 glVertex 0 , $h + 4;
517 glVertex $w + 4 , $h + 4;
518 glVertex $w + 4 , 0;
519 glEnd;
520
521 $chld->draw;
522}
523
524#############################################################################
525
526package CFClient::UI::FancyFrame;
527
528our @ISA = CFClient::UI::Bin::;
529
530use SDL::OpenGL;
531
532my @tex =
533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
535 624
536sub new { 625sub new {
537 my $class = shift; 626 my $class = shift;
538 627
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new ( 628 my $self = $class->SUPER::new (
542 bg => [1, 1, 1, 1], 629 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 630 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 631 border => 0.8,
545 @_ 632 @_
633 );
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655}
656
657sub _draw {
658 my ($self) = @_;
659
660 my ($w, $h) = ($self->{w}, $self->{h});
661
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666
667# glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0;
670# glVertex 0 , $h;
671# glVertex $w, $h;
672# glVertex $w, 0;
673# glEnd;
674
675
676 $self->child->draw;
677 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D;
679}
680
681#############################################################################
682
683package CFClient::UI::FancyFrame;
684
685our @ISA = CFClient::UI::Bin::;
686
687use CFClient::OpenGL;
688
689my @tex =
690 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
691 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
692
693sub new {
694 my $class = shift;
695
696 # TODO: user_x, user_y, overwrite moveto?
697
698 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1],
701 border => 0.8,
702 can_events => 1,
703 @_
704 );
705
706 $self->{title} &&= new CFClient::UI::Label
707 align => 0,
708 valign => 1,
709 text => $self->{title},
710 fontsize => 1;
711
712 $self
713}
714
715sub border {
716 int $_[0]{border} * $::FONTSIZE
717}
718
719sub size_request {
720 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request;
725
726 (
727 $w + $self->border * 2,
728 $h + $self->border * 2,
546 ) 729 )
547} 730}
548 731
549sub size_request {
550 my ($self) = @_;
551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
554 my ($w, $h) = $self->SUPER::size_request;
555
556 (
557 $w + $self->{border} * 2,
558 $h + $self->{border} * 2,
559 )
560}
561
562sub size_allocate { 732sub size_allocate {
563 my ($self, $x, $y, $w, $h) = @_; 733 my ($self, $w, $h) = @_;
564 734
565 $self->_size_allocate ($x, $y, $w, $h) or return;
566
567 $h -= List::Util::max 0, $self->{border} * 2; 735 $h -= List::Util::max 0, $self->border * 2;
568 $w -= List::Util::max 0, $self->{border} * 2; 736 $w -= List::Util::max 0, $self->border * 2;
569 737
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
739 if $self->{title};
740
570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 741 $self->child->configure ($self->border, $self->border, $w, $h);
571} 742}
572 743
573sub button_down { 744sub button_down {
574 my ($self, $ev, $x, $y) = @_; 745 my ($self, $ev, $x, $y) = @_;
575 746
747 my $border = $self->border;
748
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 749 if ($x < $self->{w} && $x >= $self->{w} - $border
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 750 && $y < $self->{h} && $y >= $self->{h} - $border) {
578 751
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 752 my ($ox, $oy) = ($ev->{x}, $ev->{y});
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 753 my ($bw, $bh) = ($self->{w}, $self->{h});
581 754
582 $self->{motion} = sub { 755 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_; 756 my ($ev, $x, $y) = @_;
584 757
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 758 ($x, $y) = ($ev->{x}, $ev->{y});
586 759
587 $self->{user_w} = $bw + $x - $ox; 760 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy; 761 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 762 $self->check_size;
590 }; 763 };
591 764
592 } elsif ($x >= 0 && $x < $self->{w} 765 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) { 766 && $y >= 0 && $y < $border) {
594 767
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 768 my ($ox, $oy) = ($ev->{x}, $ev->{y});
596 my ($bx, $by) = ($self->{x}, $self->{y}); 769 my ($bx, $by) = ($self->{x}, $self->{y});
597 770
598 $self->{motion} = sub { 771 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_; 772 my ($ev, $x, $y) = @_;
600 773
601 ($x, $y) = ($ev->motion_x, $ev->motion_y); 774 ($x, $y) = ($ev->{x}, $ev->{y});
602 775
603 $self->move ($bx + $x - $ox, $by + $y - $oy); 776 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update; 777 $self->update;
605 }; 778 };
606 } 779 }
627 glEnable GL_BLEND; 800 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 802 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 804
805 my $border = $self->border;
806
632 glColor @{ $self->{border_bg} }; 807 glColor @{ $self->{border_bg} };
633 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 808 $tex[1]->draw_quad (0, 0, $w, $border);
634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 809 $tex[3]->draw_quad (0, $border, $border, $ch);
635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 811 $tex[4]->draw_quad (0, $h - $border, $w, $border);
637 812
638 my $bg = $tex[0]; 813 my $bg = $tex[0];
639 814
640 # TODO: repeat texture not scale 815 # TODO: repeat texture not scale
641 my $rep_x = $cw / $bg->{w}; 816 my $rep_x = $cw / $bg->{w};
644 glColor @{ $self->{bg} }; 819 glColor @{ $self->{bg} };
645 820
646 $bg->{s} = $rep_x; 821 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y; 822 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1; 823 $bg->{wrap_mode} = 1;
649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 824 $bg->draw_quad ($border, $border, $cw, $ch);
650 825
651 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
652 glDisable GL_BLEND; 827 glDisable GL_BLEND;
653 828
829 $self->{title}->draw if $self->{title};
654 $self->child->draw; 830 $self->child->draw;
655} 831}
656 832
657############################################################################# 833#############################################################################
658 834
660 836
661our @ISA = CFClient::UI::Base::; 837our @ISA = CFClient::UI::Base::;
662 838
663use List::Util qw(max sum); 839use List::Util qw(max sum);
664 840
665use SDL::OpenGL; 841use CFClient::OpenGL;
666 842
667sub new { 843sub new {
668 my $class = shift; 844 my $class = shift;
669 845
670 $class->SUPER::new ( 846 $class->SUPER::new (
672 @_ 848 @_
673 ) 849 )
674} 850}
675 851
676sub add { 852sub add {
677 my ($self, $x, $y, $chld) = @_; 853 my ($self, $x, $y, $child) = @_;
678 854
855 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 856 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 857
682 $self->{w} = $self->{h} = -1; 858 $child->check_size;
859}
860
861# TODO: move to container class maybe? send childs a signal on removal?
862sub clear {
863 my ($self) = @_;
864
865 delete $self->{children};
683 $self->update; 866 $self->update;
684} 867}
685 868
686sub get_wh { 869sub get_wh {
687 my ($self) = @_; 870 my ($self) = @_;
693 or next; 876 or next;
694 877
695 for my $x (0 .. $#$row) { 878 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x] 879 my $widget = $row->[$x]
697 or next; 880 or next;
698 my ($w, $h) = $widget->size_request; 881 my ($w, $h) = @$widget{qw(req_w req_h)};
699 882
700 $w[$x] = max $w[$x], $w; 883 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h; 884 $h[$y] = max $h[$y], $h;
702 } 885 }
703 } 886 }
715 (sum @$hs), 898 (sum @$hs),
716 ) 899 )
717} 900}
718 901
719sub size_allocate { 902sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723 904
724 my ($ws, $hs) = $self->get_wh; 905 my ($ws, $hs) = $self->get_wh;
725 906
726 my $req_w = sum @$ws; 907 my $req_w = sum @$ws;
727 my $req_h = sum @$hs; 908 my $req_h = sum @$hs;
733 914
734 # linearly scale sizes 915 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 916 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 917 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 918
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 919 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 920 CFClient::UI::harmonize $hs;
740 921
741 my $y; 922 my $y;
742 923
743 for my $r (0 .. $#{$self->{children}}) { 924 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 925 my $row = $self->{children}[$r]
749 930
750 for my $c (0 .. $#$row) { 931 for my $c (0 .. $#$row) {
751 my $col_w = $ws->[$c]; 932 my $col_w = $ws->[$c];
752 933
753 if (my $widget = $row->[$c]) { 934 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h); 935 $widget->configure ($x, $y, $col_w, $row_h);
755 } 936 }
756 937
757 $x += $col_w; 938 $x += $col_w;
758 } 939 }
759 940
804 (List::Util::max map $_->[1], @alloc), 985 (List::Util::max map $_->[1], @alloc),
805 ) 986 )
806} 987}
807 988
808sub size_allocate { 989sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_; 990 my ($self, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812 991
813 ($h, $w) = ($w, $h); 992 ($h, $w) = ($w, $h);
814 993
815 my $children = $self->{children}; 994 my $children = $self->{children};
816 995
817 my @h = map +($_->size_request)[0], @$children; 996 my @h = map $_->{req_w}, @$children;
818 997
819 my $req_h = List::Util::sum @h; 998 my $req_h = List::Util::sum @h;
820 999
821 if ($req_h > $h) { 1000 if ($req_h > $h) {
822 # ah well, not enough space 1001 # ah well, not enough space
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1011 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 1012 $h[$_] = $alloc_h;
834 } 1013 }
835 } 1014 }
836 1015
1016 CFClient::UI::harmonize \@h;
1017
837 my $y = 0; 1018 my $y = 0;
838 for (0 .. $#$children) { 1019 for (0 .. $#$children) {
839 my $child = $children->[$_]; 1020 my $child = $children->[$_];
840 my $h = int $h[$_]; 1021 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 1022 $child->configure ($y, 0, $h, $w);
842 1023
843 $y += $h; 1024 $y += $h;
844 } 1025 }
1026
1027 1
845} 1028}
846 1029
847############################################################################# 1030#############################################################################
848 1031
849package CFClient::UI::VBox; 1032package CFClient::UI::VBox;
862 (List::Util::sum map $_->[1], @alloc), 1045 (List::Util::sum map $_->[1], @alloc),
863 ) 1046 )
864} 1047}
865 1048
866sub size_allocate { 1049sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 1050 my ($self, $w, $h) = @_;
868
869 $self->_size_allocate ($x, $y, $w, $h);
870 1051
871 my $children = $self->{children}; 1052 my $children = $self->{children};
872 1053
873 my @h = map +($_->size_request)[1], @$children; 1054 my @h = map $_->{req_h}, @$children;
874 1055
875 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
876 1057
877 if ($req_h > $h) { 1058 if ($req_h > $h) {
878 # ah well, not enough space 1059 # ah well, not enough space
886 1067
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1068 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 1069 }
889 } 1070 }
890 1071
1072 CFClient::UI::harmonize \@h;
1073
891 my $y = 0; 1074 my $y = 0;
892 for (0 .. $#$children) { 1075 for (0 .. $#$children) {
893 my $child = $children->[$_]; 1076 my $child = $children->[$_];
894 my $h = int $h[$_]; 1077 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 1078 $child->configure (0, $y, $w, $h);
896 1079
897 $y += $h; 1080 $y += $h;
898 } 1081 }
1082
1083 1
899} 1084}
900 1085
901############################################################################# 1086#############################################################################
902 1087
903package CFClient::UI::Label; 1088package CFClient::UI::Label;
904 1089
905our @ISA = CFClient::UI::Base::; 1090our @ISA = CFClient::UI::Base::;
906 1091
907use SDL::OpenGL; 1092use CFClient::OpenGL;
908 1093
909sub new { 1094sub new {
910 my ($class, %arg) = @_; 1095 my ($class, %arg) = @_;
911 1096
912 my $self = $class->SUPER::new ( 1097 my $self = $class->SUPER::new (
913 fg => [1, 1, 1], 1098 fg => [1, 1, 1],
914 fontsize => $::FONTSIZE, 1099 fontsize => 1,
915 text => "", 1100 text => "",
916 align => -1, 1101 align => -1,
1102 valign => -1,
917 padding => 2, 1103 padding => 2,
918 layout => new CFClient::Layout, 1104 layout => new CFClient::Layout,
1105 can_events => 0,
919 %arg 1106 %arg
920 ); 1107 );
921 1108
922 $self->set_text ($self->{text}); 1109 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout;
1113 }
1114
1115 $self->set_text (delete $self->{text}) if exists $self->{text};
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
923 1117
924 $self 1118 $self
925} 1119}
926 1120
927sub escape_text { 1121sub escape_text {
935} 1129}
936 1130
937sub set_text { 1131sub set_text {
938 my ($self, $text) = @_; 1132 my ($self, $text) = @_;
939 1133
940 $self->{text} = $text;
941 $self->{layout}->set_markup ($text); 1134 $self->{layout}->set_text ($text);
942 1135
943 delete $self->{texture}; 1136 delete $self->{texture};
944# $self->{w} = $self->{h} = -1; 1137 $self->check_size;
945 $self->update; 1138 $self->update;
946} 1139}
947 1140
948sub get_text { 1141sub set_markup {
949 my ($self, $text) = @_; 1142 my ($self, $markup) = @_;
950 1143
951 $self->{text} 1144 $self->{layout}->set_markup ($markup);
1145
1146 delete $self->{texture};
1147 $self->check_size;
1148 $self->update;
952} 1149}
953 1150
954sub size_request { 1151sub size_request {
955 my ($self) = @_; 1152 my ($self) = @_;
956 1153
957 $self->{layout}->set_width; 1154 $self->{layout}->set_width;
958 $self->{layout}->set_height ($self->{fontsize}); 1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156
959 my ($w, $h) = $self->{layout}->size; 1157 my ($w, $h) = $self->{layout}->size;
1158
1159 if (exists $self->{template}) {
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161
1162 my ($w2, $h2) = $self->{template}->size;
1163
1164 $w = List::Util::max $w, $w2;
1165 $h = List::Util::max $h, $h2;
1166 }
960 1167
961 ( 1168 (
962 $w + $self->{padding} * 2, 1169 $w + $self->{padding} * 2,
963 $h + $self->{padding} * 2, 1170 $h + $self->{padding} * 2,
964 ) 1171 )
965} 1172}
966 1173
967sub size_allocate { 1174sub size_allocate {
968 my ($self, $x, $y, $w, $h) = @_; 1175 my ($self, $w, $h) = @_;
969
970 $self->_size_allocate ($x, $y, $w, $h) or return;
971 1176
972 delete $self->{texture}; 1177 delete $self->{texture};
973} 1178}
974 1179
975sub update { 1180sub set_fontsize {
976 my ($self) = @_; 1181 my ($self, $fontsize) = @_;
977 1182
1183 $self->{fontsize} = $fontsize;
978 delete $self->{texture}; 1184 delete $self->{texture};
1185 $self->check_size;
979 $self->SUPER::update; 1186 $self->update;
980} 1187}
981 1188
982sub _draw { 1189sub _draw {
983 my ($self) = @_; 1190 my ($self) = @_;
984 1191
985 my $tex = $self->{texture} ||= do { 1192 my $tex = $self->{texture} ||= do {
986 $self->{layout}->set_width ($self->{w}); 1193 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
988 new_from_layout CFClient::Texture $self->{layout} 1195 new_from_layout CFClient::Texture $self->{layout}
989 }; 1196 };
990 1197
991 glEnable GL_BLEND; 1198 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995 1202
996 glColor @{$self->{fg}}; 1203 glColor @{$self->{fg}};
997 1204
998 my $x = 1205 $self->{ox} = int (
999 $self->{align} < 0 ? $self->{padding} 1206 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5; 1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1002 1210
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $tex->draw_quad ($self->{ox}, $self->{oy});
1004 1218
1005 glDisable GL_TEXTURE_2D; 1219 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND; 1220 glDisable GL_BLEND;
1007} 1221}
1008 1222
1009############################################################################# 1223#############################################################################
1010 1224
1011package CFClient::UI::Entry; 1225package CFClient::UI::EntryBase;
1012 1226
1013our @ISA = CFClient::UI::Label::; 1227our @ISA = CFClient::UI::Label::;
1014 1228
1015use SDL; 1229use CFClient::OpenGL;
1016use SDL::OpenGL;
1017 1230
1018sub new { 1231sub new {
1019 my $class = shift; 1232 my $class = shift;
1020 1233
1021 $class->SUPER::new ( 1234 $class->SUPER::new (
1023 bg => [0, 0, 0, 0.2], 1236 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5], 1237 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0], 1238 active_fg => [0, 0, 0],
1026 can_hover => 1, 1239 can_hover => 1,
1027 can_focus => 1, 1240 can_focus => 1,
1241 valign => 0,
1242 can_events => 1,
1028 @_ 1243 @_
1029 ) 1244 )
1030} 1245}
1031 1246
1032sub _set_text { 1247sub _set_text {
1033 my ($self, $text) = @_; 1248 my ($self, $text) = @_;
1034 1249
1035 my $old_text = $self->{text}; 1250 delete $self->{cur_h};
1251
1252 return if $self->{text} eq $text;
1253
1254 delete $self->{texture};
1036 1255
1037 $self->{last_activity} = $::NOW; 1256 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text; 1257 $self->{text} = $text;
1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042 1258
1043 $text =~ s/./*/g if $self->{hidden}; 1259 $text =~ s/./*/g if $self->{hidden};
1260 $self->{layout}->set_text ("$text ");
1044 1261
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1262 $self->emit (changed => $self->{text});
1263}
1046 1264
1047 $text = substr $text, 0, $self->{cursor}; 1265sub get_text {
1048 utf8::encode $text; 1266 $_[0]{text}
1049
1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1054} 1267}
1055 1268
1056sub size_request { 1269sub size_request {
1057 my ($self) = @_; 1270 my ($self) = @_;
1058 1271
1060 1273
1061 ($w + 1, $h) # add 1 for cursor 1274 ($w + 1, $h) # add 1 for cursor
1062} 1275}
1063 1276
1064sub size_allocate { 1277sub size_allocate {
1065 my ($self, $x, $y, $w, $h) = @_; 1278 my ($self, $w, $h) = @_;
1066 1279
1067 $self->SUPER::size_allocate ($x, $y, $w, $h); 1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1068
1069 $self->_set_text ($self->{text});
1070} 1281}
1071 1282
1072sub set_text { 1283sub set_text {
1073 my ($self, $text) = @_; 1284 my ($self, $text) = @_;
1074 1285
1078} 1289}
1079 1290
1080sub key_down { 1291sub key_down {
1081 my ($self, $ev) = @_; 1292 my ($self, $ev) = @_;
1082 1293
1083 my $mod = $ev->key_mod; 1294 my $mod = $ev->{mod};
1084 my $sym = $ev->key_sym; 1295 my $sym = $ev->{sym};
1085
1086 my $uni = $ev->key_unicode; 1296 my $uni = $ev->{unicode};
1087 1297
1088 my $text = $self->get_text; 1298 my $text = $self->get_text;
1089 1299
1090 if ($sym == SDLK_BACKSPACE) { 1300 if ($sym == 8) {
1091 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1092 } elsif ($sym == SDLK_DELETE) { 1302 } elsif ($sym == 127) {
1093 substr $text, $self->{cursor}, 1, ""; 1303 substr $text, $self->{cursor}, 1, "";
1094 } elsif ($sym == SDLK_LEFT) { 1304 } elsif ($sym == CFClient::SDLK_LEFT) {
1095 --$self->{cursor} if $self->{cursor}; 1305 --$self->{cursor} if $self->{cursor};
1096 } elsif ($sym == SDLK_RIGHT) { 1306 } elsif ($sym == CFClient::SDLK_RIGHT) {
1097 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1307 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1098 } elsif ($sym == SDLK_HOME) { 1308 } elsif ($sym == CFClient::SDLK_HOME) {
1099 $self->{cursor} = 0; 1309 $self->{cursor} = 0;
1100 } elsif ($sym == SDLK_END) { 1310 } elsif ($sym == CFClient::SDLK_END) {
1101 $self->{cursor} = length $text; 1311 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) { 1312 } elsif ($sym == 27) {
1103 $self->emit ('escape'); 1313 $self->emit ('escape');
1104 } elsif ($uni) { 1314 } elsif ($uni) {
1105 substr $text, $self->{cursor}++, 0, chr $uni; 1315 substr $text, $self->{cursor}++, 0, chr $uni;
1106 } 1316 }
1107 1317
1162 1372
1163 $self->SUPER::_draw; 1373 $self->SUPER::_draw;
1164 1374
1165 #TODO: force update every cursor change :( 1375 #TODO: force update every cursor change :(
1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1376 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1377
1378 unless (exists $self->{cur_h}) {
1379 my $text = substr $self->{text}, 0, $self->{cursor};
1380 utf8::encode $text;
1381
1382 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1383 }
1384
1167 glColor @{$self->{fg}}; 1385 glColor @{$self->{fg}};
1168 glBegin GL_LINES; 1386 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1387 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1388 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171 glEnd; 1389 glEnd;
1172 } 1390 }
1173} 1391}
1174 1392
1175package CFClient::UI::LineEntry; 1393package CFClient::UI::Entry;
1176 1394
1177our @ISA = CFClient::UI::Entry::; 1395our @ISA = CFClient::UI::EntryBase::;
1178 1396
1179use SDL; 1397use CFClient::OpenGL;
1180use SDL::OpenGL;
1181 1398
1182sub key_down { 1399sub key_down {
1183 my ($self, $ev) = @_; 1400 my ($self, $ev) = @_;
1184 1401
1185 my $sym = $ev->key_sym; 1402 my $sym = $ev->{sym};
1186 1403
1187 if ($sym == SDLK_RETURN) { 1404 if ($sym == 13) {
1188 $self->emit (activate => $self->get_text); 1405 $self->emit (activate => $self->get_text);
1189 $self->update; 1406 $self->update;
1190 1407
1191 } else { 1408 } else {
1192 $self->SUPER::key_down ($ev); 1409 $self->SUPER::key_down ($ev);
1198 1415
1199package CFClient::UI::Button; 1416package CFClient::UI::Button;
1200 1417
1201our @ISA = CFClient::UI::Label::; 1418our @ISA = CFClient::UI::Label::;
1202 1419
1203use SDL; 1420use CFClient::OpenGL;
1204use SDL::OpenGL;
1205 1421
1206my @tex = 1422my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1423 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1208 qw(b1_button_active.png); 1424 qw(b1_button_active.png);
1209 1425
1210sub new { 1426sub new {
1211 my $class = shift; 1427 my $class = shift;
1212 1428
1213 $class->SUPER::new ( 1429 $class->SUPER::new (
1214 padding => 4, 1430 padding => 4,
1215 fg => [1, 1, 1], 1431 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2], 1432 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0], 1433 active_fg => [0, 0, 1],
1218 can_hover => 1, 1434 can_hover => 1,
1435 align => 0,
1436 valign => 0,
1437 can_events => 1,
1219 @_ 1438 @_
1220 ) 1439 )
1221} 1440}
1222 1441
1223sub button_up { 1442sub button_up {
1231 1450
1232sub _draw { 1451sub _draw {
1233 my ($self) = @_; 1452 my ($self) = @_;
1234 1453
1235 local $self->{fg} = $self->{fg}; 1454 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
1237
1238 glEnable GL_BLEND;
1239 glEnable GL_TEXTURE_2D;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 1455
1242 if ($GRAB == $self) { 1456 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg}; 1457 $self->{fg} = $self->{active_fg};
1244 } 1458 }
1245 1459
1246 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D;
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1;
1248 1465
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250 1467
1251 glDisable GL_TEXTURE_2D; 1468 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND; 1469 glDisable GL_BLEND;
1253 1470
1254 $self->SUPER::_draw; 1471 $self->SUPER::_draw;
1259package CFClient::UI::CheckBox; 1476package CFClient::UI::CheckBox;
1260 1477
1261our @ISA = CFClient::UI::DrawBG::; 1478our @ISA = CFClient::UI::DrawBG::;
1262 1479
1263my @tex = 1480my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1482 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266 1483
1267use SDL; 1484use CFClient::OpenGL;
1268use SDL::OpenGL;
1269 1485
1270sub new { 1486sub new {
1271 my $class = shift; 1487 my $class = shift;
1272 1488
1273 $class->SUPER::new ( 1489 $class->SUPER::new (
1284 my ($self) = @_; 1500 my ($self) = @_;
1285 1501
1286 ($self->{padding} * 2 + 6) x 2 1502 ($self->{padding} * 2 + 6) x 2
1287} 1503}
1288 1504
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down { 1505sub button_down {
1296 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1297 1507
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1508 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1509 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1325 glDisable GL_BLEND; 1535 glDisable GL_BLEND;
1326} 1536}
1327 1537
1328############################################################################# 1538#############################################################################
1329 1539
1540package CFClient::UI::Image;
1541
1542our @ISA = CFClient::UI::Base::;
1543
1544use CFClient::OpenGL;
1545use Carp qw/confess/;
1546
1547our %loaded_images;
1548
1549sub new {
1550 my $class = shift;
1551
1552 my $self = $class->SUPER::new (can_events => 0, @_);
1553
1554 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1555
1556 $loaded_images{$self->{image}} ||=
1557 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1558
1559 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1560
1561 Scalar::Util::weaken $loaded_images{$self->{image}};
1562
1563 $self->{aspect} = $tex->{w} / $tex->{h};
1564
1565 $self
1566}
1567
1568sub size_request {
1569 my ($self) = @_;
1570
1571 ($self->{tex}->{w}, $self->{tex}->{h})
1572}
1573
1574sub _draw {
1575 my ($self) = @_;
1576
1577 my $tex = $self->{tex};
1578
1579 my ($w, $h) = ($self->{w}, $self->{h});
1580
1581 if ($self->{rot90}) {
1582 glRotate 90, 0, 0, 1;
1583 glTranslate 0, -$self->{w}, 0;
1584
1585 ($w, $h) = ($h, $w);
1586 }
1587
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592
1593 $tex->draw_quad (0, 0, $w, $h);
1594
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D;
1597}
1598
1599#############################################################################
1600
1601package CFClient::UI::VGauge;
1602
1603our @ISA = CFClient::UI::Base::;
1604
1605use CFClient::OpenGL;
1606
1607my %tex = (
1608 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ],
1612 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1615 ],
1616 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ],
1620 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1623 ],
1624);
1625
1626# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new {
1628 my $class = shift;
1629
1630 my $self = $class->SUPER::new (
1631 type => 'food',
1632 @_
1633 );
1634
1635 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1636
1637 $self
1638}
1639
1640sub size_request {
1641 my ($self) = @_;
1642
1643 #my $tex = $tex{$self->{type}}[0];
1644 #@$tex{qw(w h)}
1645 (0, 0)
1646}
1647
1648sub set_max {
1649 my ($self, $max) = @_;
1650
1651 $self->{max_val} = $max;
1652}
1653
1654sub set_value {
1655 my ($self, $val, $max) = @_;
1656
1657 $self->set_max ($max)
1658 if defined $max;
1659
1660 $max = $self->{max_val};
1661 $self->{val} = $val;
1662
1663 $self->update;
1664}
1665
1666sub _draw {
1667 my ($self) = @_;
1668
1669 my $tex = $tex{$self->{type}};
1670
1671 my ($w, $h) = ($self->{w}, $self->{h});
1672
1673 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1;
1675 glTranslate 0, -$self->{w}, 0;
1676
1677 ($w, $h) = ($h, $w);
1678 }
1679
1680 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682
1683 my $t1 = $tex->[0];
1684 my $t2 = $tex->[1];
1685
1686 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd;
1701
1702 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1708 glEnd;
1709
1710 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D;
1712}
1713
1714#############################################################################
1715
1716package CFClient::UI::Gauge;
1717
1718our @ISA = CFClient::UI::VBox::;
1719
1720sub new {
1721 my ($class, %arg) = @_;
1722
1723 my $self = $class->SUPER::new (
1724 tooltip => $arg{type},
1725 %arg,
1726 );
1727
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731
1732 $self
1733}
1734
1735sub set_fontsize {
1736 my ($self, $fsize) = @_;
1737
1738 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize);
1740}
1741
1742sub set_value {
1743 my ($self, $val, $max) = @_;
1744
1745 $self->set_max ($max)
1746 if defined $max;
1747
1748 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757}
1758
1759#############################################################################
1760
1330package CFClient::UI::Slider; 1761package CFClient::UI::Slider;
1331 1762
1332use strict; 1763use strict;
1333 1764
1334use SDL::OpenGL; 1765use CFClient::OpenGL;
1335 1766
1336our @ISA = CFClient::UI::DrawBG::; 1767our @ISA = CFClient::UI::DrawBG::;
1337 1768
1338my @tex = 1769my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1770 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1349 # TODO: calculations are off 1780 # TODO: calculations are off
1350 my $self = $class->SUPER::new ( 1781 my $self = $class->SUPER::new (
1351 fg => [1, 1, 1], 1782 fg => [1, 1, 1],
1352 active_fg => [0, 0, 0], 1783 active_fg => [0, 0, 0],
1353 range => [0, 0, 100, 10], 1784 range => [0, 0, 100, 10],
1354 req_w => 40, 1785 req_w => 20,
1355 req_h => 13, 1786 req_h => 20,
1356 vertical => 0, 1787 vertical => 0,
1357 can_hover => 1, 1788 can_hover => 1,
1358 inner_pad => 5, 1789 inner_pad => 5,
1359 @_ 1790 @_
1360 ); 1791 );
1464 1895
1465package CFClient::UI::TextView; 1896package CFClient::UI::TextView;
1466 1897
1467our @ISA = CFClient::UI::HBox::; 1898our @ISA = CFClient::UI::HBox::;
1468 1899
1469use SDL::OpenGL; 1900use CFClient::OpenGL;
1470 1901
1471sub new { 1902sub new {
1472 my $class = shift; 1903 my $class = shift;
1473 1904
1474 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6,
1476 req_h => $::HEIGHT / 6,
1477 fontsize => $::FONTSIZE, 1906 fontsize => 1,
1478 @_, 1907 @_,
1479 1908
1480 layout => (new CFClient::Layout), 1909 layout => (new CFClient::Layout),
1481 par => [], 1910 par => [],
1482 height => 0, 1911 height => 0,
1503sub text_height { 1932sub text_height {
1504 my ($self, $text) = @_; 1933 my ($self, $text) = @_;
1505 1934
1506 my $layout = $self->{layout}; 1935 my $layout = $self->{layout};
1507 1936
1508 $layout->set_height ($self->{fontsize}); 1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1509 $layout->set_width ($self->{w}); 1938 $layout->set_width ($self->{w});
1510 $layout->set_text ($text); 1939 $layout->set_text ($text);
1511 1940
1512 ($layout->size)[1] 1941 ($layout->size)[1]
1513} 1942}
1517 1946
1518 $self->{need_reflow}++; 1947 $self->{need_reflow}++;
1519 $self->update; 1948 $self->update;
1520} 1949}
1521 1950
1522sub size_request {
1523 my ($self) = @_;
1524
1525 ($self->{req_w}, $self->{req_h})
1526}
1527
1528sub size_allocate { 1951sub size_allocate {
1529 my ($self, $x, $y, $w, $h) = @_; 1952 my ($self, $w, $h) = @_;
1530 1953
1531 $self->SUPER::size_allocate ($x, $y, $w, $h); 1954 $self->SUPER::size_allocate ($w, $h);
1532 1955
1533 $self->{layout}->set_height ($self->{fontsize}); 1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1534 $self->{layout}->set_width ($self->{w}); 1957 $self->{layout}->set_width ($self->{children}[0]{w});
1535 1958
1536 $self->reflow; 1959 $self->reflow;
1537} 1960}
1538 1961
1539sub add_paragraph { 1962sub add_paragraph {
1558 1981
1559 return unless $self->{h} > 0; 1982 return unless $self->{h} > 0;
1560 1983
1561 delete $self->{texture}; 1984 delete $self->{texture};
1562 1985
1563 $TOPLEVEL->on_refresh ($self, sub { 1986 $ROOT->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) { 1987 if (delete $self->{need_reflow}) {
1565 my $height = 0; 1988 my $height = 0;
1566 1989
1567 $height += $_->[0] = $self->text_height ($_->[2]) 1990 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}}; 1991 for @{$self->{par}};
1626 2049
1627} 2050}
1628 2051
1629############################################################################# 2052#############################################################################
1630 2053
1631package CFClient::UI::MapWidget;
1632
1633use strict;
1634
1635use List::Util qw(min max);
1636
1637use SDL;
1638use SDL::OpenGL;
1639
1640our @ISA = CFClient::UI::Base::;
1641
1642sub new {
1643 my $class = shift;
1644
1645 $class->SUPER::new (
1646 z => -1,
1647 can_focus => 1,
1648 list => (glGenLists 1),
1649 @_
1650 )
1651}
1652
1653sub key_down {
1654 print "MAPKEYDOWN\n";
1655}
1656
1657sub key_up {
1658}
1659
1660sub button_down {
1661 my ($self, $ev, $x, $y) = @_;
1662
1663 $self->focus_in;
1664
1665 if ($ev->button == 2) {
1666 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1667 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1668
1669 $self->{motion} = sub {
1670 my ($ev, $x, $y) = @_;
1671
1672 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1673
1674 $::CFG->{map_shift_x} = $bw + $x - $ox;
1675 $::CFG->{map_shift_y} = $bh + $y - $oy;
1676
1677 $self->update;
1678 };
1679 }
1680}
1681
1682sub button_up {
1683 my ($self, $ev, $x, $y) = @_;
1684
1685 delete $self->{motion};
1686}
1687
1688sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_;
1690
1691 $self->{motion}->($ev, $x, $y) if $self->{motion};
1692}
1693
1694sub size_request {
1695 (
1696 1 + 32 * int $::WIDTH / 32,
1697 1 + 32 * int $::HEIGHT / 32,
1698 )
1699}
1700
1701sub update {
1702 my ($self) = @_;
1703
1704 $self->{need_update} = 1;
1705 $self->SUPER::update;
1706}
1707
1708sub draw {
1709 my ($self) = @_;
1710
1711 if (delete $self->{need_update}) {
1712 glNewList $self->{list}, GL_COMPILE;
1713
1714 if ($::MAP) {
1715 my $sw = int $::WIDTH / 32;
1716 my $sh = int $::HEIGHT / 32;
1717
1718 my $sx = $::CFG->{map_shift_x};
1719 my $sy = $::CFG->{map_shift_y};
1720
1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
1722
1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1724
1725 if ($::CFG->{fow_enable}) {
1726 if ($::CFG->{fow_smooth}) { # smooth fog of war
1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1728 glConvolutionFilter2D
1729 GL_CONVOLUTION_2D,
1730 GL_ALPHA,
1731 3, 3,
1732 GL_ALPHA, GL_FLOAT,
1733 pack "f*",
1734 0.1, 0.1, 0.1,
1735 0.1, 0.2, 0.1,
1736 0.1, 0.1, 0.1,
1737 ;
1738 glEnable GL_CONVOLUTION_2D;
1739 }
1740
1741 my $tex = new CFClient::Texture
1742 w => $w,
1743 h => $h,
1744 data => $data,
1745 internalformat => GL_ALPHA,
1746 format => GL_ALPHA;
1747
1748 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1749
1750 glEnable GL_BLEND;
1751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1752 glEnable GL_TEXTURE_2D;
1753 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1754
1755 glColor +($::CFG->{fow_intensity}) x 3, 1;
1756 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1757
1758 glDisable GL_TEXTURE_2D;
1759 glDisable GL_BLEND;
1760 }
1761
1762 # HACK BEGIN
1763 {
1764 my ($w, $h) = (250, 250);
1765
1766 glEnable GL_BLEND;
1767 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1768 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770
1771 CFClient::Texture->new (
1772 w => $w,
1773 h => $h,
1774 data => $::MAP->mapmap ($w, $h),
1775 type => GL_UNSIGNED_INT_8_8_8_8_REV
1776 )->draw_quad (100, 100);
1777
1778 glDisable GL_TEXTURE_2D;
1779 glDisable GL_BLEND;
1780 }
1781 # HACK END
1782 }
1783
1784 glEndList;
1785 }
1786
1787 glPushMatrix;
1788 glCallList $self->{list};
1789 glPopMatrix;
1790
1791 if ($FOCUS != $self) {
1792 glColor 64/255, 64/255, 64/255;
1793 glLogicOp GL_AND;
1794 glEnable GL_COLOR_LOGIC_OP;
1795 glBegin GL_QUADS;
1796 glVertex 0, 0;
1797 glVertex 0, $::HEIGHT;
1798 glVertex $::WIDTH, $::HEIGHT;
1799 glVertex $::WIDTH, 0;
1800 glEnd;
1801 glDisable GL_COLOR_LOGIC_OP;
1802 }
1803}
1804
1805my %DIR = (
1806 SDLK_KP8, [1, "north"],
1807 SDLK_KP9, [2, "northeast"],
1808 SDLK_KP6, [3, "east"],
1809 SDLK_KP3, [4, "southeast"],
1810 SDLK_KP2, [5, "south"],
1811 SDLK_KP1, [6, "southwest"],
1812 SDLK_KP4, [7, "west"],
1813 SDLK_KP7, [8, "northwest"],
1814
1815 SDLK_UP, [1, "north"],
1816 SDLK_RIGHT, [3, "east"],
1817 SDLK_DOWN, [5, "south"],
1818 SDLK_LEFT, [7, "west"],
1819);
1820
1821sub key_down {
1822 my ($self, $ev) = @_;
1823
1824 my $mod = $ev->key_mod;
1825 my $sym = $ev->key_sym;
1826
1827 if ($sym == SDLK_KP5) {
1828 $::CONN->user_send ("command stay fire");
1829 } elsif ($sym == SDLK_a) {
1830 $::CONN->user_send ("command apply");
1831 } elsif ($sym == SDLK_QUOTE) {
1832 $self->emit ('activate_console');
1833 } elsif ($sym == SDLK_SLASH) {
1834 $self->emit ('activate_console' => '/');
1835 } elsif (exists $DIR{$sym}) {
1836 if ($mod & KMOD_SHIFT) {
1837 $self->{shft}++;
1838 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1839 } elsif ($mod & KMOD_CTRL) {
1840 $self->{ctrl}++;
1841 $::CONN->user_send ("command run $DIR{$sym}[0]");
1842 } else {
1843 $::CONN->user_send ("command $DIR{$sym}[1]");
1844 }
1845 }
1846}
1847
1848sub key_up {
1849 my ($self, $ev) = @_;
1850
1851 my $mod = $ev->key_mod;
1852 my $sym = $ev->key_sym;
1853
1854 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1855 $::CONN->user_send ("command fire_stop");
1856 }
1857 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1858 $::CONN->user_send ("command run_stop");
1859 }
1860}
1861
1862#############################################################################
1863
1864package CFClient::UI::Animator; 2054package CFClient::UI::Animator;
1865 2055
1866use SDL::OpenGL; 2056use CFClient::OpenGL;
1867 2057
1868our @ISA = CFClient::UI::Bin::; 2058our @ISA = CFClient::UI::Bin::;
1869 2059
1870sub moveto { 2060sub moveto {
1871 my ($self, $x, $y) = @_; 2061 my ($self, $x, $y) = @_;
1911 my $class = shift; 2101 my $class = shift;
1912 2102
1913 my $self = $class->SUPER::new ( 2103 my $self = $class->SUPER::new (
1914 state => 0, 2104 state => 0,
1915 connect_activate => \&toggle_flopper, 2105 connect_activate => \&toggle_flopper,
2106 can_events => 1,
1916 @_ 2107 @_
1917 ); 2108 );
1918 2109
1919 if ($self->{state}) { 2110 if ($self->{state}) {
1920 $self->{state} = 0; 2111 $self->{state} = 0;
1927sub toggle_flopper { 2118sub toggle_flopper {
1928 my ($self) = @_; 2119 my ($self) = @_;
1929 2120
1930 # TODO: use animation 2121 # TODO: use animation
1931 if ($self->{state} = !$self->{state}) { 2122 if ($self->{state} = !$self->{state}) {
1932 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2123 $CFClient::UI::ROOT->add ($self->{other});
1933 $self->{other}->move ( 2124 $self->{other}->move ($self->coord2global (0, $self->{h}));
1934 ($::WIDTH - $self->{other}{w}) * 0.5, 2125 $self->emit ("open");
1935 ($::HEIGHT - $self->{other}{h}) * 0.5,
1936 );
1937 } else { 2126 } else {
1938 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2127 $CFClient::UI::ROOT->remove ($self->{other});
2128 $self->emit ("close");
1939 } 2129 }
1940}
1941 2130
1942############################################################################# 2131 $self->emit (changed => $self->{state});
2132}
1943 2133
2134#############################################################################
2135
1944package CFClient::UI::Toplevel; 2136package CFClient::UI::Tooltip;
2137
2138our @ISA = CFClient::UI::Bin::;
2139
2140use CFClient::OpenGL;
2141
2142sub new {
2143 my $class = shift;
2144
2145 $class->SUPER::new (
2146 @_,
2147 can_events => 0,
2148 )
2149}
2150
2151sub set_text {
2152 my ($self, $text) = @_;
2153
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8;
2155 $self->{label}->set_text ($text);
2156 $self->add ($self->{label});
2157}
2158
2159sub size_request {
2160 my ($self) = @_;
2161
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163
2164 $w = List::Util::min $::WIDTH * 0.2, $w;
2165
2166 ($w, $h)
2167}
2168
2169#############################################################################
2170
2171package CFClient::UI::Root;
1945 2172
1946our @ISA = CFClient::UI::Container::; 2173our @ISA = CFClient::UI::Container::;
1947 2174
1948use SDL::OpenGL; 2175use CFClient::OpenGL;
2176
2177sub check_size {
2178 my ($self) = @_;
2179
2180 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2181}
1949 2182
1950sub size_request { 2183sub size_request {
1951 ($::WIDTH, $::HEIGHT) 2184 ($::WIDTH, $::HEIGHT)
1952} 2185}
1953 2186
1954sub size_allocate { 2187sub configure {
1955 my ($self, $x, $y, $w, $h) = @_; 2188 my ($self, $x, $y, $w, $h) = @_;
1956 2189
1957 $self->_size_allocate ($x, $y, $w, $h); 2190 $self->SUPER::configure ($x, $y, $w, $h);
1958 2191
1959 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1960 for @{$self->{children}}; 2192 for my $child (@{$self->{children}}) {
1961} 2193 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1962 2194
1963sub translate { 2195 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2196 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2197 $child->configure ($X, $Y, $W,$H);
2198 }
2199}
2200
2201sub _topleft {
1964 my ($self, $x, $y) = @_; 2202 my ($self, $x, $y) = @_;
1965 2203
1966 ($x, $y) 2204 ($x, $y)
1967} 2205}
1968 2206
1969sub update { 2207sub update {
1970 my ($self) = @_; 2208 my ($self) = @_;
1971 2209
1972 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2210 $self->check_size;
1973 ::refresh (); 2211 ::refresh ();
1974} 2212}
1975 2213
1976sub add { 2214sub add {
1977 my ($self, $widget) = @_; 2215 my ($self, $child) = @_;
1978 2216
2217 # integerize window positions
2218 $child->{x} = int $child->{x};
2219 $child->{y} = int $child->{y};
2220
1979 $self->SUPER::add ($widget); 2221 $self->SUPER::add ($child);
1980
1981 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1982} 2222}
1983 2223
1984sub on_refresh { 2224sub on_refresh {
1985 my ($self, $id, $cb) = @_; 2225 my ($self, $id, $cb) = @_;
1986 2226
2009 2249
2010############################################################################# 2250#############################################################################
2011 2251
2012package CFClient::UI; 2252package CFClient::UI;
2013 2253
2254$ROOT = new CFClient::UI::Root;
2014$TOPLEVEL = new CFClient::UI::Toplevel; 2255$TOOLTIP = new CFClient::UI::Tooltip;
2015 2256
20161 22571
2017 2258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines