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.107 by root, Fri Apr 14 20:27:35 2006 UTC vs.
Revision 1.173 by root, Tue Apr 25 10:30:48 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_markup ($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->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
27 56
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
33 }
34 62
63 check_tooltip;
64 }
65
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
60 99
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 101
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
115}
116
117# convert position array to integers
118sub harmonize {
119 my ($vals) = @_;
120
121 my $rem = 0;
122
123 for (@$vals) {
124 my $i = int $_ + $rem;
125 $rem += $_ - $i;
126 $_ = $i;
127 }
71} 128}
72 129
73############################################################################# 130#############################################################################
74 131
75package CFClient::UI::Base; 132package CFClient::UI::Base;
76 133
77use strict; 134use strict;
78 135
79use SDL::OpenGL; 136use CFClient::OpenGL;
80 137
81sub new { 138sub new {
82 my $class = shift; 139 my $class = shift;
83 140
84 my $self = bless { 141 my $self = bless {
85 x => 0, 142 x => 0,
86 y => 0, 143 y => 0,
87 z => 0, 144 z => 0,
88 w => -1, 145 can_events => 1,
89 h => -1,
90 @_ 146 @_
91 }, $class; 147 }, $class;
92 148
93 for (keys %$self) { 149 for (keys %$self) {
94 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
… …
97 } 153 }
98 154
99 $self 155 $self
100} 156}
101 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
165sub show {
166 my ($self) = @_;
167
168 return if $self->{parent};
169
170 $CFClient::UI::ROOT->add ($self);
171}
172
173sub hide {
174 my ($self) = @_;
175
176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
178
179 $self->{parent}->remove ($self)
180 if $self->{parent};
181}
182
102sub move { 183sub move {
103 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
185
104 $self->{x} = $x; 186 $self->{x} = int $x;
105 $self->{y} = $y; 187 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
107}
108 189
109sub needs_redraw { 190 $self->update;
110 0 191}
192
193sub set_size {
194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
111} 200}
112 201
113sub size_request { 202sub size_request {
114 require Carp; 203 require Carp;
115 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
116} 205}
117 206
118sub _size_allocate { 207sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
120 209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
121 $self->{x} = $x; 223 $self->{x} = $x;
122 $self->{y} = $y; 224 $self->{y} = $y;
225 $self->update;
226 }
123 227
124 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
125
126 $self->{w} = $w; 229 $self->{w} = $w;
127 $self->{h} = $h; 230 $self->{h} = $h;
128 231
232 $self->size_allocate ($w, $h);
233 $self->update;
129 1 234 }
130} 235}
131 236
132sub size_allocate { 237sub size_allocate {
238 # nothing to be done
239}
240
241sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size {
133 my ($self, $x, $y, $w, $h) = @_; 255 my ($self, $w, $h) = @_;
134 256
135 $self->_size_allocate ($x, $y, $w, $h); 257 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
261# return top left coordinates
262sub _topleft {
263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
267
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 269}
137 270
138# translate global coordinates to local coordinate system 271# translate global coordinates to local coordinate system
139sub translate { 272sub coord2local {
140 my ($self, $x, $y) = @_; 273 my ($self, $x, $y) = @_;
141 274
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 275 my ($X, $Y) = $self->_topleft;
276 ($x - $X, $y - $Y)
277}
278
279# translate local coordinates to global coordinate system
280sub coord2global {
281 my ($self, $x, $y) = @_;
282
283 my ($X, $Y) = $self->_topleft;
284 ($x + $X, $y + $Y)
143} 285}
144 286
145sub focus_in { 287sub focus_in {
146 my ($self) = @_; 288 my ($self) = @_;
147 289
148 return if $FOCUS == $self; 290 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 291 return unless $self->{can_focus};
150 292
151 my $focus = $FOCUS; $FOCUS = $self; 293 my $focus = $FOCUS; $FOCUS = $self;
294
295 $self->emit (focus_in => $focus);
296
152 $focus->update if $focus; 297 $focus->update if $focus;
153 $FOCUS->update; 298 $FOCUS->update;
154} 299}
155 300
156sub focus_out { 301sub focus_out {
157 my ($self) = @_; 302 my ($self) = @_;
158 303
159 return unless $FOCUS == $self; 304 return unless $FOCUS == $self;
160 305
161 my $focus = $FOCUS; undef $FOCUS; 306 my $focus = $FOCUS; undef $FOCUS;
307
308 $self->emit (focus_out => $focus);
309
162 $focus->update if $focus; #? 310 $focus->update if $focus; #?
163} 311}
164 312
165sub mouse_motion { } 313sub mouse_motion { }
166sub button_up { } 314sub button_up { }
… …
190 glPopMatrix; 338 glPopMatrix;
191 339
192 if ($self == $HOVER && $self->{can_hover}) { 340 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 341 my ($x, $y) = @$self{qw(x y)};
194 342
195 glColor 0, 0, 1, 0.2; 343 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 344 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 345 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 346 glBegin GL_QUADS;
199 glVertex $x , $y; 347 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 348 glVertex $x + $self->{w}, $y;
201 glVertex $x + $self->{w}, $y + $self->{h}; 349 glVertex $x + $self->{w}, $y + $self->{h};
202 glVertex $x , $y + $self->{h}; 350 glVertex $x , $y + $self->{h};
203 glEnd; 351 glEnd;
204 glDisable GL_BLEND; 352 glDisable GL_BLEND;
205 } 353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0;
361 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h};
364 glEnd;
365 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 }
206} 368}
207 369
208sub _draw { 370sub _draw {
209 my ($self) = @_; 371 my ($self) = @_;
210 372
211 warn "no draw defined for $self\n"; 373 warn "no draw defined for $self\n";
212} 374}
213 375
214sub find_widget { 376sub find_widget {
215 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
216 380
217 return $self 381 return $self
218 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
219 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
220 384
221 () 385 ()
222} 386}
223 387
224sub set_parent { 388sub set_parent {
225 my ($self, $par) = @_; 389 my ($self, $parent) = @_;
226 390
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 391 Scalar::Util::weaken ($self->{parent} = $parent);
229} 392}
230 393
231sub get_parent { 394sub check_size {
395 my ($self) = @_;
396
232 $_[0]->{parent} 397 $self->{parent}
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
233} 418}
234 419
235sub update { 420sub update {
236 my ($self) = @_; 421 my ($self) = @_;
237 422
… …
240} 425}
241 426
242sub connect { 427sub connect {
243 my ($self, $signal, $cb) = @_; 428 my ($self, $signal, $cb) = @_;
244 429
245 push @{ $self->{cb}{$signal} }, $cb; 430 push @{ $self->{signal_cb}{$signal} }, $cb;
246} 431}
247 432
248sub emit { 433sub emit {
249 my ($self, $signal, @args) = @_; 434 my ($self, $signal, @args) = @_;
250 435
251 $_->($self, @args) 436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
252 for @{$self->{cb}{$signal} || []};
253} 437}
254 438
255sub DESTROY { 439sub DESTROY {
256 my ($self) = @_; 440 my ($self) = @_;
257 441
… …
263package CFClient::UI::DrawBG; 447package CFClient::UI::DrawBG;
264 448
265our @ISA = CFClient::UI::Base::; 449our @ISA = CFClient::UI::Base::;
266 450
267use strict; 451use strict;
268use SDL::OpenGL; 452use CFClient::OpenGL;
269 453
270sub new { 454sub new {
271 my $class = shift; 455 my $class = shift;
272 456
273 # range [value, low, high, page] 457 # range [value, low, high, page]
… …
302 486
303package CFClient::UI::Empty; 487package CFClient::UI::Empty;
304 488
305our @ISA = CFClient::UI::Base::; 489our @ISA = CFClient::UI::Base::;
306 490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
307sub size_request { 496sub size_request {
308 (0, 0) 497 (0, 0)
309} 498}
310 499
311sub draw { } 500sub draw { }
… …
319sub new { 508sub new {
320 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
321 510
322 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
323 512
324 my $self = $class->SUPER::new (children => [], %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
325 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
326 519
327 $self 520 $self
328} 521}
329 522
330sub add { 523sub add {
331 my ($self, $chld) = @_; 524 my ($self, $child) = @_;
332 525
333 $chld->set_parent ($self); 526 $child->set_parent ($self);
527
528 use sort 'stable';
334 529
335 $self->{children} = [ 530 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 531 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 532 @{$self->{children}}, $child
338 ]; 533 ];
339 534
340 $self->{w} = $self->{h} = -1; 535 $child->check_size;
536}
537
538sub children {
539 @{ $_[0]{children} }
540}
541
542sub remove {
543 my ($self, $child) = @_;
544
545 delete $child->{parent};
546 $child->hide;
547
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549
550 $self->check_size;
341 $self->update; 551 $self->update;
342} 552}
343 553
344sub remove { 554sub clear {
345 my ($self, $widget) = @_; 555 my ($self) = @_;
346 556
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 557 my $children = delete $self->{children};
558 $self->{children} = [];
348 559
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 560 for (@$children) {
561 delete $_->{parent};
562 $_->hide;
563 }
350} 564}
351 565
352sub find_widget { 566sub find_widget {
353 my ($self, $x, $y) = @_; 567 my ($self, $x, $y) = @_;
354 568
… …
384 598
385 $class->SUPER::new (children => [$child], %arg) 599 $class->SUPER::new (children => [$child], %arg)
386} 600}
387 601
388sub add { 602sub add {
389 my ($self, $widget) = @_; 603 my ($self, $child) = @_;
390 604
391 $self->{children} = []; 605 $self->{children} = [];
392 606
393 $self->SUPER::add ($widget); 607 $self->SUPER::add ($child);
394} 608}
395 609
396sub remove { 610sub remove {
397 my ($self, $widget) = @_; 611 my ($self, $widget) = @_;
398 612
… …
407sub size_request { 621sub size_request {
408 $_[0]{children}[0]->size_request 622 $_[0]{children}[0]->size_request
409} 623}
410 624
411sub size_allocate { 625sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 626 my ($self, $w, $h) = @_;
413 627
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 628 $self->{children}[0]->configure (0, 0, $w, $h);
417} 629}
418 630
419############################################################################# 631#############################################################################
420 632
421package CFClient::UI::Window; 633package CFClient::UI::Window;
422 634
423our @ISA = CFClient::UI::Bin::; 635our @ISA = CFClient::UI::Bin::;
424 636
425use SDL::OpenGL; 637use CFClient::OpenGL;
426 638
427sub new { 639sub new {
428 my ($class, %arg) = @_; 640 my ($class, %arg) = @_;
429 641
430 my $self = $class->SUPER::new (%arg); 642 my $self = $class->SUPER::new (%arg);
… …
447 $self->child->draw; 659 $self->child->draw;
448 }; 660 };
449} 661}
450 662
451sub size_allocate { 663sub size_allocate {
452 my ($self, $x, $y, $w, $h) = @_; 664 my ($self, $w, $h) = @_;
453 665
454 $self->_size_allocate ($x, $y, $w, $h) or return;
455
456 $self->child->size_allocate (0, 0, $w, $h); 666 $self->child->configure (0, 0, $w, $h);
457 667
458 $self->render_chld; 668 $self->render_chld;
459} 669}
460 670
461sub _draw { 671sub _draw {
… …
477 glDisable GL_TEXTURE_2D; 687 glDisable GL_TEXTURE_2D;
478} 688}
479 689
480############################################################################# 690#############################################################################
481 691
692package CFClient::UI::ViewPort;
693
694our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
482package CFClient::UI::Frame; 716package CFClient::UI::Frame;
483 717
484our @ISA = CFClient::UI::Bin::; 718our @ISA = CFClient::UI::Bin::;
485 719
486use SDL::OpenGL; 720use 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 721
536sub new { 722sub new {
537 my $class = shift; 723 my $class = shift;
538 724
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new ( 725 my $self = $class->SUPER::new (
542 bg => [1, 1, 1, 1], 726 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 727 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 728 border => 0.8,
545 @_ 729 @_
730 );
731
732 $self
733}
734
735sub _draw {
736 my ($self) = @_;
737
738 my ($w, $h) = ($self->{w}, $self->{h});
739
740 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744
745# glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0;
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752
753
754 $self->child->draw;
755 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D;
757}
758
759#############################################################################
760
761package CFClient::UI::FancyFrame;
762
763our @ISA = CFClient::UI::Bin::;
764
765use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770
771sub new {
772 my $class = shift;
773
774 # TODO: user_x, user_y, overwrite moveto?
775
776 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1],
779 border => 0.8,
780 can_events => 1,
781 @_
782 );
783
784 $self->{title} &&= new CFClient::UI::Label
785 align => 0,
786 valign => 1,
787 text => $self->{title},
788 fontsize => 1;
789
790 $self
791}
792
793sub border {
794 int $_[0]{border} * $::FONTSIZE
795}
796
797sub size_request {
798 my ($self) = @_;
799
800 my ($w, $h) = $self->SUPER::size_request;
801
802 (
803 $w + $self->border * 2,
804 $h + $self->border * 2,
546 ) 805 )
547} 806}
548 807
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 { 808sub size_allocate {
563 my ($self, $x, $y, $w, $h) = @_; 809 my ($self, $w, $h) = @_;
564 810
565 $self->_size_allocate ($x, $y, $w, $h) or return;
566
567 $h -= List::Util::max 0, $self->{border} * 2; 811 $h -= List::Util::max 0, $self->border * 2;
568 $w -= List::Util::max 0, $self->{border} * 2; 812 $w -= List::Util::max 0, $self->border * 2;
569 813
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
815 if $self->{title};
816
570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 817 $self->child->configure ($self->border, $self->border, $w, $h);
571} 818}
572 819
573sub button_down { 820sub button_down {
574 my ($self, $ev, $x, $y) = @_; 821 my ($self, $ev, $x, $y) = @_;
575 822
823 my $border = $self->border;
824
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 825 if ($x < $self->{w} && $x >= $self->{w} - $border
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 826 && $y < $self->{h} && $y >= $self->{h} - $border) {
578 827
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 828 my ($ox, $oy) = ($ev->{x}, $ev->{y});
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 829 my ($bw, $bh) = ($self->{w}, $self->{h});
581 830
582 $self->{motion} = sub { 831 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_; 832 my ($ev, $x, $y) = @_;
584 833
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 834 ($x, $y) = ($ev->{x}, $ev->{y});
586 835
587 $self->{user_w} = $bw + $x - $ox; 836 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy; 837 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 838 $self->check_size;
590 }; 839 };
591 840
592 } elsif ($x >= 0 && $x < $self->{w} 841 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) { 842 && $y >= 0 && $y < $border) {
594 843
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 844 my ($ox, $oy) = ($ev->{x}, $ev->{y});
596 my ($bx, $by) = ($self->{x}, $self->{y}); 845 my ($bx, $by) = ($self->{x}, $self->{y});
597 846
598 $self->{motion} = sub { 847 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_; 848 my ($ev, $x, $y) = @_;
600 849
601 ($x, $y) = ($ev->motion_x, $ev->motion_y); 850 ($x, $y) = ($ev->{x}, $ev->{y});
602 851
603 $self->move ($bx + $x - $ox, $by + $y - $oy); 852 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update; 853 $self->update;
605 }; 854 };
606 } 855 }
… …
627 glEnable GL_BLEND; 876 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 878 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 880
881 my $border = $self->border;
882
632 glColor @{ $self->{border_bg} }; 883 glColor @{ $self->{border_bg} };
633 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 884 $tex[1]->draw_quad (0, 0, $w, $border);
634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 885 $tex[3]->draw_quad (0, $border, $border, $ch);
635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 887 $tex[4]->draw_quad (0, $h - $border, $w, $border);
637 888
638 my $bg = $tex[0]; 889 my $bg = $tex[0];
639 890
640 # TODO: repeat texture not scale 891 # TODO: repeat texture not scale
641 my $rep_x = $cw / $bg->{w}; 892 my $rep_x = $cw / $bg->{w};
… …
644 glColor @{ $self->{bg} }; 895 glColor @{ $self->{bg} };
645 896
646 $bg->{s} = $rep_x; 897 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y; 898 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1; 899 $bg->{wrap_mode} = 1;
649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 900 $bg->draw_quad ($border, $border, $cw, $ch);
650 901
651 glDisable GL_TEXTURE_2D; 902 glDisable GL_TEXTURE_2D;
652 glDisable GL_BLEND; 903 glDisable GL_BLEND;
653 904
905 $self->{title}->draw if $self->{title};
654 $self->child->draw; 906 $self->child->draw;
655} 907}
656 908
657############################################################################# 909#############################################################################
658 910
… …
660 912
661our @ISA = CFClient::UI::Base::; 913our @ISA = CFClient::UI::Base::;
662 914
663use List::Util qw(max sum); 915use List::Util qw(max sum);
664 916
665use SDL::OpenGL; 917use CFClient::OpenGL;
666 918
667sub new { 919sub new {
668 my $class = shift; 920 my $class = shift;
669 921
670 $class->SUPER::new ( 922 $class->SUPER::new (
… …
672 @_ 924 @_
673 ) 925 )
674} 926}
675 927
676sub add { 928sub add {
677 my ($self, $x, $y, $chld) = @_; 929 my ($self, $x, $y, $child) = @_;
678 930
931 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 932 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 933
682 $self->{w} = $self->{h} = -1; 934 $child->check_size;
935}
936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# TODO: move to container class maybe? send childs a signal on removal?
942sub clear {
943 my ($self) = @_;
944
945 my @children = $self->children;
946 delete $self->{children};
947
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
683 $self->update; 953 $self->update;
684} 954}
685 955
686sub get_wh { 956sub get_wh {
687 my ($self) = @_; 957 my ($self) = @_;
… …
693 or next; 963 or next;
694 964
695 for my $x (0 .. $#$row) { 965 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x] 966 my $widget = $row->[$x]
697 or next; 967 or next;
698 my ($w, $h) = $widget->size_request; 968 my ($w, $h) = @$widget{qw(req_w req_h)};
699 969
700 $w[$x] = max $w[$x], $w; 970 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h; 971 $h[$y] = max $h[$y], $h;
702 } 972 }
703 } 973 }
… …
715 (sum @$hs), 985 (sum @$hs),
716 ) 986 )
717} 987}
718 988
719sub size_allocate { 989sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_; 990 my ($self, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723 991
724 my ($ws, $hs) = $self->get_wh; 992 my ($ws, $hs) = $self->get_wh;
725 993
726 my $req_w = sum @$ws; 994 my $req_w = sum @$ws;
727 my $req_h = sum @$hs; 995 my $req_h = sum @$hs;
… …
733 1001
734 # linearly scale sizes 1002 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1003 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1004 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 1005
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 1006 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 1007 CFClient::UI::harmonize $hs;
740 1008
741 my $y; 1009 my $y;
742 1010
743 for my $r (0 .. $#{$self->{children}}) { 1011 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 1012 my $row = $self->{children}[$r]
… …
749 1017
750 for my $c (0 .. $#$row) { 1018 for my $c (0 .. $#$row) {
751 my $col_w = $ws->[$c]; 1019 my $col_w = $ws->[$c];
752 1020
753 if (my $widget = $row->[$c]) { 1021 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h); 1022 $widget->configure ($x, $y, $col_w, $row_h);
755 } 1023 }
756 1024
757 $x += $col_w; 1025 $x += $col_w;
758 } 1026 }
759 1027
… …
804 (List::Util::max map $_->[1], @alloc), 1072 (List::Util::max map $_->[1], @alloc),
805 ) 1073 )
806} 1074}
807 1075
808sub size_allocate { 1076sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_; 1077 my ($self, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812 1078
813 ($h, $w) = ($w, $h); 1079 ($h, $w) = ($w, $h);
814 1080
815 my $children = $self->{children}; 1081 my $children = $self->{children};
816 1082
817 my @h = map +($_->size_request)[0], @$children; 1083 my @h = map $_->{req_w}, @$children;
818 1084
819 my $req_h = List::Util::sum @h; 1085 my $req_h = List::Util::sum @h;
820 1086
821 if ($req_h > $h) { 1087 if ($req_h > $h) {
822 # ah well, not enough space 1088 # ah well, not enough space
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 1099 $h[$_] = $alloc_h;
834 } 1100 }
835 } 1101 }
836 1102
1103 CFClient::UI::harmonize \@h;
1104
837 my $y = 0; 1105 my $y = 0;
838 for (0 .. $#$children) { 1106 for (0 .. $#$children) {
839 my $child = $children->[$_]; 1107 my $child = $children->[$_];
840 my $h = int $h[$_]; 1108 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 1109 $child->configure ($y, 0, $h, $w);
842 1110
843 $y += $h; 1111 $y += $h;
844 } 1112 }
1113
1114 1
845} 1115}
846 1116
847############################################################################# 1117#############################################################################
848 1118
849package CFClient::UI::VBox; 1119package CFClient::UI::VBox;
… …
862 (List::Util::sum map $_->[1], @alloc), 1132 (List::Util::sum map $_->[1], @alloc),
863 ) 1133 )
864} 1134}
865 1135
866sub size_allocate { 1136sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
868
869 $self->_size_allocate ($x, $y, $w, $h);
870 1138
871 my $children = $self->{children}; 1139 my $children = $self->{children};
872 1140
873 my @h = map +($_->size_request)[1], @$children; 1141 my @h = map $_->{req_h}, @$children;
874 1142
875 my $req_h = List::Util::sum @h; 1143 my $req_h = List::Util::sum @h;
876 1144
877 if ($req_h > $h) { 1145 if ($req_h > $h) {
878 # ah well, not enough space 1146 # ah well, not enough space
… …
886 1154
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 1156 }
889 } 1157 }
890 1158
1159 CFClient::UI::harmonize \@h;
1160
891 my $y = 0; 1161 my $y = 0;
892 for (0 .. $#$children) { 1162 for (0 .. $#$children) {
893 my $child = $children->[$_]; 1163 my $child = $children->[$_];
894 my $h = int $h[$_]; 1164 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 1165 $child->configure (0, $y, $w, $h);
896 1166
897 $y += $h; 1167 $y += $h;
898 } 1168 }
1169
1170 1
899} 1171}
900 1172
901############################################################################# 1173#############################################################################
902 1174
903package CFClient::UI::Label; 1175package CFClient::UI::Label;
904 1176
905our @ISA = CFClient::UI::Base::; 1177our @ISA = CFClient::UI::Base::;
906 1178
907use SDL::OpenGL; 1179use CFClient::OpenGL;
908 1180
909sub new { 1181sub new {
910 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
911 1183
912 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
913 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
914 fontsize => $::FONTSIZE, 1186 #font => default_font
1187 fontsize => 1,
915 text => "", 1188 text => "",
916 align => -1, 1189 align => -1,
1190 valign => -1,
917 padding => 2, 1191 padding => 2,
918 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1193 can_events => 0,
919 %arg 1194 %arg
920 ); 1195 );
921 1196
922 $self->set_text ($self->{text}); 1197 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout;
1201 }
1202
1203 $self->set_text (delete $self->{text}) if exists $self->{text};
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
923 1205
924 $self 1206 $self
925} 1207}
926 1208
927sub escape_text { 1209sub escape {
928 local $_ = $_[1]; 1210 local $_ = $_[1];
929 1211
930 s/&/&amp;/g; 1212 s/&/&amp;/g;
931 s/>/&gt;/g; 1213 s/>/&gt;/g;
932 s/</&lt;/g; 1214 s/</&lt;/g;
933 1215
934 $_[1] 1216 $_[1]
935} 1217}
936 1218
1219sub update {
1220 my ($self) = @_;
1221
1222 delete $self->{texture};
1223 $self->SUPER::update;
1224}
1225
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
937sub set_text { 1232sub set_text {
938 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
939 1234
1235 return if $self->{text} eq "T$text";
940 $self->{text} = $text; 1236 $self->{text} = "T$text";
1237
941 $self->{layout}->set_markup ($text); 1238 $self->{layout}->set_text ($text);
942 1239
943 delete $self->{texture}; 1240 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update; 1241 $self->update;
1242 $self->check_size;
946} 1243}
947 1244
948sub get_text { 1245sub set_markup {
949 my ($self, $text) = @_; 1246 my ($self, $markup) = @_;
950 1247
951 $self->{text} 1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1251 $self->{layout}->set_markup ($markup);
1252
1253 delete $self->{texture};
1254 $self->update;
1255 $self->check_size;
952} 1256}
953 1257
954sub size_request { 1258sub size_request {
955 my ($self) = @_; 1259 my ($self) = @_;
956 1260
957 $self->{layout}->set_width; 1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
958 $self->{layout}->set_height ($self->{fontsize}); 1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264
959 my ($w, $h) = $self->{layout}->size; 1265 my ($w, $h) = $self->{layout}->size;
1266
1267 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font};
1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1270
1271 my ($w2, $h2) = $self->{template}->size;
1272
1273 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2;
1275 }
960 1276
961 ( 1277 (
962 $w + $self->{padding} * 2, 1278 $w + $self->{padding} * 2,
963 $h + $self->{padding} * 2, 1279 $h + $self->{padding} * 2,
964 ) 1280 )
965} 1281}
966 1282
967sub size_allocate { 1283sub size_allocate {
968 my ($self, $x, $y, $w, $h) = @_; 1284 my ($self, $w, $h) = @_;
969
970 $self->_size_allocate ($x, $y, $w, $h) or return;
971 1285
972 delete $self->{texture}; 1286 delete $self->{texture};
973} 1287}
974 1288
975sub update { 1289sub set_fontsize {
976 my ($self) = @_; 1290 my ($self, $fontsize) = @_;
977 1291
1292 $self->{fontsize} = $fontsize;
978 delete $self->{texture}; 1293 delete $self->{texture};
1294 $self->check_size;
979 $self->SUPER::update; 1295 $self->update;
980} 1296}
981 1297
982sub _draw { 1298sub _draw {
983 my ($self) = @_; 1299 my ($self) = @_;
984 1300
985 my $tex = $self->{texture} ||= do { 1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
986 $self->{layout}->set_width ($self->{w}); 1303 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
988 new_from_layout CFClient::Texture $self->{layout} 1305 new_from_layout CFClient::Texture $self->{layout}
989 }; 1306 };
990 1307
991 glEnable GL_BLEND; 1308 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D; 1310 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995 1312
996 glColor @{$self->{fg}}; 1313 glColor @{$self->{fg}};
997 1314
998 my $x = 1315 $self->{ox} = int (
999 $self->{align} < 0 ? $self->{padding} 1316 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5; 1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1002 1320
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy});
1004 1328
1005 glDisable GL_TEXTURE_2D; 1329 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND; 1330 glDisable GL_BLEND;
1007} 1331}
1008 1332
1009############################################################################# 1333#############################################################################
1010 1334
1011package CFClient::UI::Entry; 1335package CFClient::UI::EntryBase;
1012 1336
1013our @ISA = CFClient::UI::Label::; 1337our @ISA = CFClient::UI::Label::;
1014 1338
1015use SDL; 1339use CFClient::OpenGL;
1016use SDL::OpenGL;
1017 1340
1018sub new { 1341sub new {
1019 my $class = shift; 1342 my $class = shift;
1020 1343
1021 $class->SUPER::new ( 1344 $class->SUPER::new (
1022 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1026 can_hover => 1, 1349 can_hover => 1,
1027 can_focus => 1, 1350 can_focus => 1,
1351 valign => 0,
1352 can_events => 1,
1028 @_ 1353 @_
1029 ) 1354 )
1030} 1355}
1031 1356
1032sub _set_text { 1357sub _set_text {
1033 my ($self, $text) = @_; 1358 my ($self, $text) = @_;
1034 1359
1035 my $old_text = $self->{text}; 1360 delete $self->{cur_h};
1361
1362 return if $self->{text} eq $text;
1363
1364 delete $self->{texture};
1036 1365
1037 $self->{last_activity} = $::NOW; 1366 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text; 1367 $self->{text} = $text;
1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042 1368
1043 $text =~ s/./*/g if $self->{hidden}; 1369 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text ");
1044 1371
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1372 $self->emit (changed => $self->{text});
1373}
1046 1374
1047 $text = substr $text, 0, $self->{cursor}; 1375sub get_text {
1048 utf8::encode $text; 1376 $_[0]{text}
1049
1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1054} 1377}
1055 1378
1056sub size_request { 1379sub size_request {
1057 my ($self) = @_; 1380 my ($self) = @_;
1058 1381
… …
1060 1383
1061 ($w + 1, $h) # add 1 for cursor 1384 ($w + 1, $h) # add 1 for cursor
1062} 1385}
1063 1386
1064sub size_allocate { 1387sub size_allocate {
1065 my ($self, $x, $y, $w, $h) = @_; 1388 my ($self, $w, $h) = @_;
1066 1389
1067 $self->SUPER::size_allocate ($x, $y, $w, $h); 1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1068
1069 $self->_set_text ($self->{text});
1070} 1391}
1071 1392
1072sub set_text { 1393sub set_text {
1073 my ($self, $text) = @_; 1394 my ($self, $text) = @_;
1074 1395
… …
1078} 1399}
1079 1400
1080sub key_down { 1401sub key_down {
1081 my ($self, $ev) = @_; 1402 my ($self, $ev) = @_;
1082 1403
1083 my $mod = $ev->key_mod; 1404 my $mod = $ev->{mod};
1084 my $sym = $ev->key_sym; 1405 my $sym = $ev->{sym};
1085
1086 my $uni = $ev->key_unicode; 1406 my $uni = $ev->{unicode};
1087 1407
1088 my $text = $self->get_text; 1408 my $text = $self->get_text;
1089 1409
1090 if ($sym == SDLK_BACKSPACE) { 1410 if ($sym == 8) {
1091 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1092 } elsif ($sym == SDLK_DELETE) { 1412 } elsif ($sym == 127) {
1093 substr $text, $self->{cursor}, 1, ""; 1413 substr $text, $self->{cursor}, 1, "";
1094 } elsif ($sym == SDLK_LEFT) { 1414 } elsif ($sym == CFClient::SDLK_LEFT) {
1095 --$self->{cursor} if $self->{cursor}; 1415 --$self->{cursor} if $self->{cursor};
1096 } elsif ($sym == SDLK_RIGHT) { 1416 } elsif ($sym == CFClient::SDLK_RIGHT) {
1097 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1417 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1098 } elsif ($sym == SDLK_HOME) { 1418 } elsif ($sym == CFClient::SDLK_HOME) {
1099 $self->{cursor} = 0; 1419 $self->{cursor} = 0;
1100 } elsif ($sym == SDLK_END) { 1420 } elsif ($sym == CFClient::SDLK_END) {
1101 $self->{cursor} = length $text; 1421 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) { 1422 } elsif ($sym == 27) {
1103 $self->emit ('escape'); 1423 $self->emit ('escape');
1104 } elsif ($uni) { 1424 } elsif ($uni) {
1105 substr $text, $self->{cursor}++, 0, chr $uni; 1425 substr $text, $self->{cursor}++, 0, chr $uni;
1106 } 1426 }
1107 1427
… …
1162 1482
1163 $self->SUPER::_draw; 1483 $self->SUPER::_draw;
1164 1484
1165 #TODO: force update every cursor change :( 1485 #TODO: force update every cursor change :(
1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1486 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1487
1488 unless (exists $self->{cur_h}) {
1489 my $text = substr $self->{text}, 0, $self->{cursor};
1490 utf8::encode $text;
1491
1492 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1493 }
1494
1167 glColor @{$self->{fg}}; 1495 glColor @{$self->{fg}};
1168 glBegin GL_LINES; 1496 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1497 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1498 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171 glEnd; 1499 glEnd;
1172 } 1500 }
1173} 1501}
1174 1502
1175package CFClient::UI::LineEntry; 1503package CFClient::UI::Entry;
1176 1504
1177our @ISA = CFClient::UI::Entry::; 1505our @ISA = CFClient::UI::EntryBase::;
1178 1506
1179use SDL; 1507use CFClient::OpenGL;
1180use SDL::OpenGL;
1181 1508
1182sub key_down { 1509sub key_down {
1183 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1184 1511
1185 my $sym = $ev->key_sym; 1512 my $sym = $ev->{sym};
1186 1513
1187 if ($sym == SDLK_RETURN) { 1514 if ($sym == 13) {
1515 unshift @{$self->{history}},
1516 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = '';
1188 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1189 $self->update; 1520 $self->update;
1521
1522 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text;
1525 }
1526 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++;
1528 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1529 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 }
1533
1534 } elsif ($sym == CFClient::SDLK_DOWN) {
1535 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537
1538 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else {
1541 $self->set_text ($self->{history_saveback});
1542 }
1190 1543
1191 } else { 1544 } else {
1192 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1193 } 1546 }
1194 1547
… …
1198 1551
1199package CFClient::UI::Button; 1552package CFClient::UI::Button;
1200 1553
1201our @ISA = CFClient::UI::Label::; 1554our @ISA = CFClient::UI::Label::;
1202 1555
1203use SDL; 1556use CFClient::OpenGL;
1204use SDL::OpenGL;
1205 1557
1206my @tex = 1558my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1208 qw(b1_button_active.png); 1560 qw(b1_button_active.png);
1209 1561
1210sub new { 1562sub new {
1211 my $class = shift; 1563 my $class = shift;
1212 1564
1213 $class->SUPER::new ( 1565 $class->SUPER::new (
1214 padding => 4, 1566 padding => 4,
1215 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0], 1569 active_fg => [0, 0, 1],
1218 can_hover => 1, 1570 can_hover => 1,
1571 align => 0,
1572 valign => 0,
1573 can_events => 1,
1219 @_ 1574 @_
1220 ) 1575 )
1221} 1576}
1222 1577
1223sub button_up { 1578sub button_up {
… …
1231 1586
1232sub _draw { 1587sub _draw {
1233 my ($self) = @_; 1588 my ($self) = @_;
1234 1589
1235 local $self->{fg} = $self->{fg}; 1590 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
1237
1238 glEnable GL_BLEND;
1239 glEnable GL_TEXTURE_2D;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 1591
1242 if ($GRAB == $self) { 1592 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg}; 1593 $self->{fg} = $self->{active_fg};
1244 } 1594 }
1245 1595
1246 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D;
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1;
1248 1601
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250 1603
1251 glDisable GL_TEXTURE_2D; 1604 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND; 1605 glDisable GL_BLEND;
1253 1606
1254 $self->SUPER::_draw; 1607 $self->SUPER::_draw;
… …
1259package CFClient::UI::CheckBox; 1612package CFClient::UI::CheckBox;
1260 1613
1261our @ISA = CFClient::UI::DrawBG::; 1614our @ISA = CFClient::UI::DrawBG::;
1262 1615
1263my @tex = 1616my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1618 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266 1619
1267use SDL; 1620use CFClient::OpenGL;
1268use SDL::OpenGL;
1269 1621
1270sub new { 1622sub new {
1271 my $class = shift; 1623 my $class = shift;
1272 1624
1273 $class->SUPER::new ( 1625 $class->SUPER::new (
… …
1284 my ($self) = @_; 1636 my ($self) = @_;
1285 1637
1286 ($self->{padding} * 2 + 6) x 2 1638 ($self->{padding} * 2 + 6) x 2
1287} 1639}
1288 1640
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down { 1641sub button_down {
1296 my ($self, $ev, $x, $y) = @_; 1642 my ($self, $ev, $x, $y) = @_;
1297 1643
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1325 glDisable GL_BLEND; 1671 glDisable GL_BLEND;
1326} 1672}
1327 1673
1328############################################################################# 1674#############################################################################
1329 1675
1676package CFClient::UI::Image;
1677
1678our @ISA = CFClient::UI::Base::;
1679
1680use CFClient::OpenGL;
1681use Carp qw/confess/;
1682
1683our %loaded_images;
1684
1685sub new {
1686 my $class = shift;
1687
1688 my $self = $class->SUPER::new (can_events => 0, @_);
1689
1690 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1691
1692 $loaded_images{$self->{image}} ||=
1693 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1694
1695 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1696
1697 Scalar::Util::weaken $loaded_images{$self->{image}};
1698
1699 $self->{aspect} = $tex->{w} / $tex->{h};
1700
1701 $self
1702}
1703
1704sub size_request {
1705 my ($self) = @_;
1706
1707 ($self->{tex}->{w}, $self->{tex}->{h})
1708}
1709
1710sub _draw {
1711 my ($self) = @_;
1712
1713 my $tex = $self->{tex};
1714
1715 my ($w, $h) = ($self->{w}, $self->{h});
1716
1717 if ($self->{rot90}) {
1718 glRotate 90, 0, 0, 1;
1719 glTranslate 0, -$self->{w}, 0;
1720
1721 ($w, $h) = ($h, $w);
1722 }
1723
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728
1729 $tex->draw_quad (0, 0, $w, $h);
1730
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D;
1733}
1734
1735#############################################################################
1736
1737package CFClient::UI::VGauge;
1738
1739our @ISA = CFClient::UI::Base::;
1740
1741use List::Util qw(min max);
1742
1743use CFClient::OpenGL;
1744
1745my %tex = (
1746 food => [
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1749 ],
1750 grace => [
1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1753 ],
1754 hp => [
1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1757 ],
1758 mana => [
1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1761 ],
1762);
1763
1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1765sub new {
1766 my $class = shift;
1767
1768 my $self = $class->SUPER::new (
1769 type => 'food',
1770 @_
1771 );
1772
1773 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1774
1775 $self
1776}
1777
1778sub size_request {
1779 my ($self) = @_;
1780
1781 #my $tex = $tex{$self->{type}}[0];
1782 #@$tex{qw(w h)}
1783 (0, 0)
1784}
1785
1786sub set_max {
1787 my ($self, $max) = @_;
1788
1789 return if $self->{max_val} == $max;
1790
1791 $self->{max_val} = $max;
1792 $self->update;
1793}
1794
1795sub set_value {
1796 my ($self, $val, $max) = @_;
1797
1798 $self->set_max ($max)
1799 if defined $max;
1800
1801 return if $self->{val} == $val;
1802
1803 $self->{val} = $val;
1804 $self->update;
1805}
1806
1807sub _draw {
1808 my ($self) = @_;
1809
1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1812
1813 my ($w, $h) = ($self->{w}, $self->{h});
1814
1815 if ($self->{vertical}) {
1816 glRotate 90, 0, 0, 1;
1817 glTranslate 0, -$self->{w}, 0;
1818
1819 ($w, $h) = ($h, $w);
1820 }
1821
1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1823
1824 my $ycut1 = max 0, min 1, $ycut;
1825 my $ycut2 = max 0, min 1, $ycut - 1;
1826
1827 my $h1 = $self->{h} * (1 - $ycut1);
1828 my $h2 = $self->{h} * (1 - $ycut2);
1829
1830 glEnable GL_BLEND;
1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1832 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834
1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1836 glBegin GL_QUADS;
1837 glTexCoord 0 , 0; glVertex 0 , 0;
1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1841 glEnd;
1842
1843 my $ycut1 = List::Util::min 1, $ycut;
1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1845 glBegin GL_QUADS;
1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1850 glEnd;
1851
1852 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd;
1860 }
1861
1862 glDisable GL_BLEND;
1863 glDisable GL_TEXTURE_2D;
1864}
1865
1866#############################################################################
1867
1868package CFClient::UI::Gauge;
1869
1870our @ISA = CFClient::UI::VBox::;
1871
1872sub new {
1873 my ($class, %arg) = @_;
1874
1875 my $self = $class->SUPER::new (
1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1879 %arg,
1880 );
1881
1882 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1883 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1885
1886 $self
1887}
1888
1889sub set_fontsize {
1890 my ($self, $fsize) = @_;
1891
1892 $self->{value}->set_fontsize ($fsize);
1893 $self->{max} ->set_fontsize ($fsize);
1894}
1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 $self->{gauge}->set_max ($max);
1900 $self->{max}->set_text ($max);
1901}
1902
1903sub set_value {
1904 my ($self, $val, $max) = @_;
1905
1906 $self->set_max ($max)
1907 if defined $max;
1908
1909 $self->{gauge}->set_value ($val, $max);
1910 $self->{value}->set_text ($val);
1911}
1912
1913#############################################################################
1914
1330package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
1331 1916
1332use strict; 1917use strict;
1333 1918
1334use SDL::OpenGL; 1919use CFClient::OpenGL;
1335 1920
1336our @ISA = CFClient::UI::DrawBG::; 1921our @ISA = CFClient::UI::DrawBG::;
1337 1922
1338my @tex = 1923my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1924 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1349 # TODO: calculations are off 1934 # TODO: calculations are off
1350 my $self = $class->SUPER::new ( 1935 my $self = $class->SUPER::new (
1351 fg => [1, 1, 1], 1936 fg => [1, 1, 1],
1352 active_fg => [0, 0, 0], 1937 active_fg => [0, 0, 0],
1353 range => [0, 0, 100, 10], 1938 range => [0, 0, 100, 10],
1354 req_w => 40, 1939 req_w => 20,
1355 req_h => 13, 1940 req_h => 20,
1356 vertical => 0, 1941 vertical => 0,
1357 can_hover => 1, 1942 can_hover => 1,
1358 inner_pad => 5, 1943 inner_pad => 5,
1359 @_ 1944 @_
1360 ); 1945 );
… …
1464 2049
1465package CFClient::UI::TextView; 2050package CFClient::UI::TextView;
1466 2051
1467our @ISA = CFClient::UI::HBox::; 2052our @ISA = CFClient::UI::HBox::;
1468 2053
1469use SDL::OpenGL; 2054use CFClient::OpenGL;
1470 2055
1471sub new { 2056sub new {
1472 my $class = shift; 2057 my $class = shift;
1473 2058
1474 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6, 2060 fontsize => 1,
1476 req_h => $::HEIGHT / 6, 2061 can_events => 0,
1477 fontsize => $::FONTSIZE, 2062 #font => default_font
1478 @_, 2063 @_,
1479 2064
1480 layout => (new CFClient::Layout), 2065 layout => (new CFClient::Layout),
1481 par => [], 2066 par => [],
1482 height => 0, 2067 height => 0,
1483 children => [ 2068 children => [
1484 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1485 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1486 ], 2071 ],
1487 ); 2072 );
1488 2073
… …
1503sub text_height { 2088sub text_height {
1504 my ($self, $text) = @_; 2089 my ($self, $text) = @_;
1505 2090
1506 my $layout = $self->{layout}; 2091 my $layout = $self->{layout};
1507 2092
1508 $layout->set_height ($self->{fontsize}); 2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1509 $layout->set_width ($self->{w}); 2094 $layout->set_width ($self->{w});
1510 $layout->set_text ($text); 2095 $layout->set_text ($text);
1511 2096
1512 ($layout->size)[1] 2097 ($layout->size)[1]
1513} 2098}
… …
1517 2102
1518 $self->{need_reflow}++; 2103 $self->{need_reflow}++;
1519 $self->update; 2104 $self->update;
1520} 2105}
1521 2106
1522sub size_request {
1523 my ($self) = @_;
1524
1525 ($self->{req_w}, $self->{req_h})
1526}
1527
1528sub size_allocate { 2107sub size_allocate {
1529 my ($self, $x, $y, $w, $h) = @_; 2108 my ($self, $w, $h) = @_;
1530 2109
1531 $self->SUPER::size_allocate ($x, $y, $w, $h); 2110 $self->SUPER::size_allocate ($w, $h);
1532 2111
2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
1533 $self->{layout}->set_height ($self->{fontsize}); 2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1534 $self->{layout}->set_width ($self->{w}); 2114 $self->{layout}->set_width ($self->{children}[0]{w});
1535 2115
1536 $self->reflow; 2116 $self->reflow;
1537} 2117}
1538 2118
1539sub add_paragraph { 2119sub add_paragraph {
… …
1558 2138
1559 return unless $self->{h} > 0; 2139 return unless $self->{h} > 0;
1560 2140
1561 delete $self->{texture}; 2141 delete $self->{texture};
1562 2142
1563 $TOPLEVEL->on_refresh ($self, sub { 2143 $ROOT->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) { 2144 if (delete $self->{need_reflow}) {
1565 my $height = 0; 2145 my $height = 0;
1566 2146
1567 $height += $_->[0] = $self->text_height ($_->[2]) 2147 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}}; 2148 for @{$self->{par}};
… …
1590 2170
1591 my $y = 0; 2171 my $y = 0;
1592 2172
1593 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
1594 2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
1595 for my $par (@{$self->{par}}) { 2177 for my $par (@{$self->{par}}) {
1596 my $h = $par->[0]; 2178 my $h = $par->[0];
1597 2179
1598 if ($y0 < $y + $h && $y < $y1) { 2180 if ($y0 < $y + $h && $y < $y1) {
1599 $layout->set_text ($par->[2]); 2181 $layout->set_text ($par->[2]);
… …
1616 my ($self) = @_; 2198 my ($self) = @_;
1617 2199
1618 if ($self->{texture}) { 2200 if ($self->{texture}) {
1619 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
1620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1;
1621 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1622 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
1623 } 2206 }
1624 2207
1625 $self->{children}[1]->draw; 2208 $self->{children}[1]->draw;
1626 2209
1627} 2210}
1628 2211
1629############################################################################# 2212#############################################################################
1630 2213
1631package CFClient::UI::MapWidget;
1632
1633use strict;
1634
1635use List::Util qw(min max);
1636
1637use SDL;
1638use SDL::OpenGL;
1639
1640our @ISA = CFClient::UI::Base::;
1641
1642sub new {
1643 my $class = shift;
1644
1645 $class->SUPER::new (
1646 z => -1,
1647 can_focus => 1,
1648 list => (glGenLists 1),
1649 @_
1650 )
1651}
1652
1653sub key_down {
1654 print "MAPKEYDOWN\n";
1655}
1656
1657sub key_up {
1658}
1659
1660sub size_request {
1661 (
1662 1 + 32 * int $::WIDTH / 32,
1663 1 + 32 * int $::HEIGHT / 32,
1664 )
1665}
1666
1667sub update {
1668 my ($self) = @_;
1669
1670 $self->{need_update} = 1;
1671 $self->SUPER::update;
1672}
1673
1674sub draw {
1675 my ($self) = @_;
1676
1677 $self->{need_update}++;#d#
1678 if (delete $self->{need_update}) {
1679 glNewList $self->{list}, GL_COMPILE;
1680
1681 my $sw = int $::WIDTH / 32;
1682 my $sh = int $::HEIGHT / 32;
1683
1684 if ($::MAP) {
1685 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1686
1687 if ($::CFG->{fow_enable}) {
1688 if ($::CFG->{fow_smooth}) { # smooth fog of war
1689 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1690 glConvolutionFilter2D
1691 GL_CONVOLUTION_2D,
1692 GL_ALPHA,
1693 3, 3,
1694 GL_ALPHA, GL_FLOAT,
1695 pack "f*",
1696 0.1, 0.1, 0.1,
1697 0.1, 0.2, 0.1,
1698 0.1, 0.1, 0.1,
1699 ;
1700 glEnable GL_CONVOLUTION_2D;
1701 }
1702
1703 my $tex = new CFClient::Texture
1704 w => $w,
1705 h => $h,
1706 data => $data,
1707 internalformat => GL_ALPHA,
1708 format => GL_ALPHA;
1709
1710 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1711
1712 glEnable GL_BLEND;
1713 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1715
1716 glColor +($::CFG->{fow_intensity}) x 3, 1;
1717 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1718
1719 glDisable GL_TEXTURE_2D;
1720 glDisable GL_BLEND;
1721 }
1722 }
1723
1724 glEndList;
1725 }
1726
1727 glCallList $self->{list};
1728
1729 if ($FOCUS != $self) {
1730 glColor 64/255, 64/255, 64/255;
1731 glLogicOp GL_AND;
1732 glEnable GL_COLOR_LOGIC_OP;
1733 glBegin GL_QUADS;
1734 glVertex 0, 0;
1735 glVertex 0, $::HEIGHT;
1736 glVertex $::WIDTH, $::HEIGHT;
1737 glVertex $::WIDTH, 0;
1738 glEnd;
1739 glDisable GL_COLOR_LOGIC_OP;
1740 }
1741}
1742
1743my %DIR = (
1744 SDLK_KP8, [1, "north"],
1745 SDLK_KP9, [2, "northeast"],
1746 SDLK_KP6, [3, "east"],
1747 SDLK_KP3, [4, "southeast"],
1748 SDLK_KP2, [5, "south"],
1749 SDLK_KP1, [6, "southwest"],
1750 SDLK_KP4, [7, "west"],
1751 SDLK_KP7, [8, "northwest"],
1752
1753 SDLK_UP, [1, "north"],
1754 SDLK_RIGHT, [3, "east"],
1755 SDLK_DOWN, [5, "south"],
1756 SDLK_LEFT, [7, "west"],
1757);
1758
1759sub key_down {
1760 my ($self, $ev) = @_;
1761
1762 my $mod = $ev->key_mod;
1763 my $sym = $ev->key_sym;
1764
1765 if ($sym == SDLK_KP5) {
1766 $::CONN->user_send ("command stay fire");
1767 } elsif ($sym == SDLK_a) {
1768 $::CONN->user_send ("command apply");
1769 } elsif ($sym == SDLK_QUOTE) {
1770 $self->emit ('activate_console');
1771 } elsif ($sym == SDLK_SLASH) {
1772 $self->emit ('activate_console' => '/');
1773 } elsif (exists $DIR{$sym}) {
1774 if ($mod & KMOD_SHIFT) {
1775 $self->{shft}++;
1776 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1777 } elsif ($mod & KMOD_CTRL) {
1778 $self->{ctrl}++;
1779 $::CONN->user_send ("command run $DIR{$sym}[0]");
1780 } else {
1781 $::CONN->user_send ("command $DIR{$sym}[1]");
1782 }
1783 }
1784}
1785
1786sub key_up {
1787 my ($self, $ev) = @_;
1788
1789 my $mod = $ev->key_mod;
1790 my $sym = $ev->key_sym;
1791
1792 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1793 $::CONN->user_send ("command fire_stop");
1794 }
1795 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1796 $::CONN->user_send ("command run_stop");
1797 }
1798}
1799
1800#############################################################################
1801
1802package CFClient::UI::Animator; 2214package CFClient::UI::Animator;
1803 2215
1804use SDL::OpenGL; 2216use CFClient::OpenGL;
1805 2217
1806our @ISA = CFClient::UI::Bin::; 2218our @ISA = CFClient::UI::Bin::;
1807 2219
1808sub moveto { 2220sub moveto {
1809 my ($self, $x, $y) = @_; 2221 my ($self, $x, $y) = @_;
… …
1847 2259
1848sub new { 2260sub new {
1849 my $class = shift; 2261 my $class = shift;
1850 2262
1851 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
1852 state => 0, 2264 state => 0,
1853 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
1854 @_ 2266 @_
1855 ); 2267 );
1856 2268
1857 if ($self->{state}) { 2269 if ($self->{state}) {
… …
1865sub toggle_flopper { 2277sub toggle_flopper {
1866 my ($self) = @_; 2278 my ($self) = @_;
1867 2279
1868 # TODO: use animation 2280 # TODO: use animation
1869 if ($self->{state} = !$self->{state}) { 2281 if ($self->{state} = !$self->{state}) {
1870 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2282 $CFClient::UI::ROOT->add ($self->{other});
1871 $self->{other}->move ( 2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
1872 ($::WIDTH - $self->{other}{w}) * 0.5, 2284 $self->emit ("open");
1873 ($::HEIGHT - $self->{other}{h}) * 0.5,
1874 );
1875 } else { 2285 } else {
1876 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291}
2292
2293#############################################################################
2294
2295package CFClient::UI::Tooltip;
2296
2297our @ISA = CFClient::UI::Bin::;
2298
2299use CFClient::OpenGL;
2300
2301sub new {
2302 my $class = shift;
2303
2304 $class->SUPER::new (
2305 @_,
2306 can_events => 0,
2307 )
2308}
2309
2310sub set_markup {
2311 my ($self, $text) = @_;
2312
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2314 $self->{label}->set_markup ($text);
2315 $self->add ($self->{label});
2316}
2317
2318sub size_request {
2319 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324
2325 ($w + 4, $h + 4)
2326}
2327
2328sub size_allocate {
2329 my ($self, $w, $h) = @_;
2330
2331 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332}
2333
2334sub _draw {
2335 my ($self) = @_;
2336
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375;
2339
2340 my ($w, $h) = @$self{qw(w h)};
2341
2342 glColor 1, 0.8, 0.4;
2343 glBegin GL_QUADS;
2344 glVertex 0 , 0;
2345 glVertex 0 , $h;
2346 glVertex $w, $h;
2347 glVertex $w, 0;
2348 glEnd;
1877 } 2349
1878} 2350 glColor 0, 0, 0;
2351 glBegin GL_LINE_LOOP;
2352 glVertex 0 , 0;
2353 glVertex 0 , $h;
2354 glVertex $w, $h;
2355 glVertex $w, 0;
2356 glEnd;
2357
2358 glPopMatrix;
1879 2359
1880############################################################################# 2360 glTranslate 2, 2;
2361 $self->SUPER::_draw;
2362}
1881 2363
2364#############################################################################
2365
1882package CFClient::UI::Toplevel; 2366package CFClient::UI::Face;
2367
2368our @ISA = CFClient::UI::Base::;
2369
2370use CFClient::OpenGL;
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 aspect => 1,
2377 @_,
2378 )
2379}
2380
2381sub size_request {
2382 (32, 8)
2383}
2384
2385sub draw {
2386 my ($self) = @_;
2387
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389
2390 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 }
2400}
2401
2402#############################################################################
2403
2404package CFClient::UI::Root;
1883 2405
1884our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
1885 2407
1886use SDL::OpenGL; 2408use CFClient::OpenGL;
2409
2410sub check_size {
2411 my ($self) = @_;
2412
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2414}
1887 2415
1888sub size_request { 2416sub size_request {
1889 ($::WIDTH, $::HEIGHT) 2417 ($::WIDTH, $::HEIGHT)
1890} 2418}
1891 2419
1892sub size_allocate { 2420sub configure {
1893 my ($self, $x, $y, $w, $h) = @_; 2421 my ($self, $x, $y, $w, $h) = @_;
1894 2422
1895 $self->_size_allocate ($x, $y, $w, $h); 2423 $self->SUPER::configure ($x, $y, $w, $h);
1896 2424
1897 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1898 for @{$self->{children}}; 2425 for my $child (@{$self->{children}}) {
1899} 2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1900 2427
1901sub translate { 2428 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H);
2431 }
2432}
2433
2434sub _topleft {
1902 my ($self, $x, $y) = @_; 2435 my ($self, $x, $y) = @_;
1903 2436
1904 ($x, $y) 2437 ($x, $y)
1905} 2438}
1906 2439
1907sub update { 2440sub update {
1908 my ($self) = @_; 2441 my ($self) = @_;
1909 2442
1910 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2443 $self->check_size;
1911 ::refresh (); 2444 ::refresh ();
1912} 2445}
1913 2446
1914sub add { 2447sub add {
1915 my ($self, $widget) = @_; 2448 my ($self, $child) = @_;
1916 2449
2450 # integerize window positions
2451 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y};
2453
1917 $self->SUPER::add ($widget); 2454 $self->SUPER::add ($child);
1918
1919 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1920} 2455}
1921 2456
1922sub on_refresh { 2457sub on_refresh {
1923 my ($self, $id, $cb) = @_; 2458 my ($self, $id, $cb) = @_;
1924 2459
… …
1947 2482
1948############################################################################# 2483#############################################################################
1949 2484
1950package CFClient::UI; 2485package CFClient::UI;
1951 2486
2487$ROOT = new CFClient::UI::Root;
1952$TOPLEVEL = new CFClient::UI::Toplevel; 2488$TOOLTIP = new CFClient::UI::Tooltip;
1953 2489
19541 24901
1955 2491

Diff Legend

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