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

Diff Legend

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