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

Diff Legend

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