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.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.160 by root, Mon Apr 24 03:33:51 2006 UTC

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

Diff Legend

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