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.102 by elmex, Fri Apr 14 12:17:06 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; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $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);
… …
439} 651}
440 652
441sub render_chld { 653sub render_chld {
442 my ($self) = @_; 654 my ($self) = @_;
443 655
444 $self->{texture} = 656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 657 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 658 glClear GL_COLOR_BUFFER_BIT;
447 ); 659 $self->child->draw;
660 };
448} 661}
449 662
450sub size_allocate { 663sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 664 my ($self, $w, $h) = @_;
452 665
453 $self->_size_allocate ($x, $y, $w, $h) or return;
454
455 $self->child->size_allocate (0, 0, $w, $h); 666 $self->child->configure (0, 0, $w, $h);
456 667
457 $self->render_chld; 668 $self->render_chld;
458} 669}
459 670
460sub _draw { 671sub _draw {
… …
476 glDisable GL_TEXTURE_2D; 687 glDisable GL_TEXTURE_2D;
477} 688}
478 689
479############################################################################# 690#############################################################################
480 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
481package CFClient::UI::Frame; 716package CFClient::UI::Frame;
482 717
483our @ISA = CFClient::UI::Bin::; 718our @ISA = CFClient::UI::Bin::;
484 719
485use SDL::OpenGL; 720use CFClient::OpenGL;
486
487sub size_request {
488 my ($self) = @_;
489 my $chld = $self->child
490 or return (0, 0);
491
492 $chld->move (2, 2);
493
494 map { $_ + 4 } $chld->size_request;
495}
496
497sub size_allocate {
498 my ($self, $x, $y, $w, $h) = @_;
499
500 $self->_size_allocate ($x, $y, $w, $h) or return;
501
502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
503}
504
505sub _draw {
506 my ($self) = @_;
507
508 my $chld = $self->child;
509
510 my ($w, $h) = $chld->size_request;
511
512 glBegin GL_QUADS;
513 glColor 0, 0, 0;
514 glVertex 0 , 0;
515 glVertex 0 , $h + 4;
516 glVertex $w + 4 , $h + 4;
517 glVertex $w + 4 , 0;
518 glEnd;
519
520 $chld->draw;
521}
522
523#############################################################################
524
525package CFClient::UI::FancyFrame;
526
527our @ISA = CFClient::UI::Bin::;
528
529use SDL::OpenGL;
530
531my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534 721
535sub new { 722sub new {
536 my $class = shift; 723 my $class = shift;
537 724
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new ( 725 my $self = $class->SUPER::new (
541 bg => [1, 1, 1, 1], 726 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 727 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 728 border => 0.8,
544 @_ 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,
545 ) 805 )
546} 806}
547 807
548sub size_request {
549 my ($self) = @_;
550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
553 my ($w, $h) = $self->SUPER::size_request;
554
555 (
556 $w + $self->{border} * 2,
557 $h + $self->{border} * 2,
558 )
559}
560
561sub size_allocate { 808sub size_allocate {
562 my ($self, $x, $y, $w, $h) = @_; 809 my ($self, $w, $h) = @_;
563 810
564 $self->_size_allocate ($x, $y, $w, $h) or return;
565
566 $h -= List::Util::max 0, $self->{border} * 2; 811 $h -= List::Util::max 0, $self->border * 2;
567 $w -= List::Util::max 0, $self->{border} * 2; 812 $w -= List::Util::max 0, $self->border * 2;
568 813
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
815 if $self->{title};
816
569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 817 $self->child->configure ($self->border, $self->border, $w, $h);
570} 818}
571 819
572sub button_down { 820sub button_down {
573 my ($self, $ev, $x, $y) = @_; 821 my ($self, $ev, $x, $y) = @_;
574 822
823 my $border = $self->border;
824
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 825 if ($x < $self->{w} && $x >= $self->{w} - $border
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 826 && $y < $self->{h} && $y >= $self->{h} - $border) {
577 827
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 828 my ($ox, $oy) = ($ev->{x}, $ev->{y});
579 my ($bw, $bh) = ($self->{w}, $self->{h}); 829 my ($bw, $bh) = ($self->{w}, $self->{h});
580 830
581 $self->{motion} = sub { 831 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_; 832 my ($ev, $x, $y) = @_;
583 833
584 ($x, $y) = ($ev->motion_x, $ev->motion_y); 834 ($x, $y) = ($ev->{x}, $ev->{y});
585 835
586 $self->{user_w} = $bw + $x - $ox; 836 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy; 837 $self->{user_h} = $bh + $y - $oy;
588 $self->update; 838 $self->check_size;
589 }; 839 };
590 840
591 } elsif ($x >= 0 && $x < $self->{w} 841 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) { 842 && $y >= 0 && $y < $border) {
593 843
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 844 my ($ox, $oy) = ($ev->{x}, $ev->{y});
595 my ($bx, $by) = ($self->{x}, $self->{y}); 845 my ($bx, $by) = ($self->{x}, $self->{y});
596 846
597 $self->{motion} = sub { 847 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_; 848 my ($ev, $x, $y) = @_;
599 849
600 ($x, $y) = ($ev->motion_x, $ev->motion_y); 850 ($x, $y) = ($ev->{x}, $ev->{y});
601 851
602 $self->move ($bx + $x - $ox, $by + $y - $oy); 852 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update; 853 $self->update;
604 }; 854 };
605 } 855 }
… …
626 glEnable GL_BLEND; 876 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
628 glEnable GL_TEXTURE_2D; 878 glEnable GL_TEXTURE_2D;
629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
630 880
881 my $border = $self->border;
882
631 glColor @{ $self->{border_bg} }; 883 glColor @{ $self->{border_bg} };
632 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 884 $tex[1]->draw_quad (0, 0, $w, $border);
633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 885 $tex[3]->draw_quad (0, $border, $border, $ch);
634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 887 $tex[4]->draw_quad (0, $h - $border, $w, $border);
636 888
637 my $bg = $tex[0]; 889 my $bg = $tex[0];
638 890
639 # TODO: repeat texture not scale 891 # TODO: repeat texture not scale
640 my $rep_x = $cw / $bg->{w}; 892 my $rep_x = $cw / $bg->{w};
… …
643 glColor @{ $self->{bg} }; 895 glColor @{ $self->{bg} };
644 896
645 $bg->{s} = $rep_x; 897 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y; 898 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1; 899 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 900 $bg->draw_quad ($border, $border, $cw, $ch);
649 901
650 glDisable GL_TEXTURE_2D; 902 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND; 903 glDisable GL_BLEND;
652 904
905 $self->{title}->draw if $self->{title};
653 $self->child->draw; 906 $self->child->draw;
654} 907}
655 908
656############################################################################# 909#############################################################################
657 910
… …
659 912
660our @ISA = CFClient::UI::Base::; 913our @ISA = CFClient::UI::Base::;
661 914
662use List::Util qw(max sum); 915use List::Util qw(max sum);
663 916
664use SDL::OpenGL; 917use CFClient::OpenGL;
665 918
666sub new { 919sub new {
667 my $class = shift; 920 my $class = shift;
668 921
669 $class->SUPER::new ( 922 $class->SUPER::new (
… …
671 @_ 924 @_
672 ) 925 )
673} 926}
674 927
675sub add { 928sub add {
676 my ($self, $x, $y, $chld) = @_; 929 my ($self, $x, $y, $child) = @_;
677 930
931 $child->set_parent ($self);
678 $self->{children}[$y][$x] = $chld; 932 $self->{children}[$y][$x] = $child;
679 $chld->set_parent ($self);
680 933
681 $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
682 $self->update; 953 $self->update;
683} 954}
684 955
685sub get_wh { 956sub get_wh {
686 my ($self) = @_; 957 my ($self) = @_;
… …
692 or next; 963 or next;
693 964
694 for my $x (0 .. $#$row) { 965 for my $x (0 .. $#$row) {
695 my $widget = $row->[$x] 966 my $widget = $row->[$x]
696 or next; 967 or next;
697 my ($w, $h) = $widget->size_request; 968 my ($w, $h) = @$widget{qw(req_w req_h)};
698 969
699 $w[$x] = max $w[$x], $w; 970 $w[$x] = max $w[$x], $w;
700 $h[$y] = max $h[$y], $h; 971 $h[$y] = max $h[$y], $h;
701 } 972 }
702 } 973 }
… …
714 (sum @$hs), 985 (sum @$hs),
715 ) 986 )
716} 987}
717 988
718sub size_allocate { 989sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_; 990 my ($self, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722 991
723 my ($ws, $hs) = $self->get_wh; 992 my ($ws, $hs) = $self->get_wh;
724 993
725 my $req_w = sum @$ws; 994 my $req_w = sum @$ws;
726 my $req_h = sum @$hs; 995 my $req_h = sum @$hs;
… …
731 my $col_expand = (sum @col_expand) || 1; 1000 my $col_expand = (sum @col_expand) || 1;
732 1001
733 # linearly scale sizes 1002 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1003 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1004 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1005
1006 CFClient::UI::harmonize $ws;
1007 CFClient::UI::harmonize $hs;
736 1008
737 my $y; 1009 my $y;
738 1010
739 for my $r (0 .. $#{$self->{children}}) { 1011 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r] 1012 my $row = $self->{children}[$r]
… …
745 1017
746 for my $c (0 .. $#$row) { 1018 for my $c (0 .. $#$row) {
747 my $col_w = $ws->[$c]; 1019 my $col_w = $ws->[$c];
748 1020
749 if (my $widget = $row->[$c]) { 1021 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h); 1022 $widget->configure ($x, $y, $col_w, $row_h);
751 } 1023 }
752 1024
753 $x += $col_w; 1025 $x += $col_w;
754 } 1026 }
755 1027
… …
800 (List::Util::max map $_->[1], @alloc), 1072 (List::Util::max map $_->[1], @alloc),
801 ) 1073 )
802} 1074}
803 1075
804sub size_allocate { 1076sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_; 1077 my ($self, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808 1078
809 ($h, $w) = ($w, $h); 1079 ($h, $w) = ($w, $h);
810 1080
811 my $children = $self->{children}; 1081 my $children = $self->{children};
812 1082
813 my @h = map +($_->size_request)[0], @$children; 1083 my @h = map $_->{req_w}, @$children;
814 1084
815 my $req_h = List::Util::sum @h; 1085 my $req_h = List::Util::sum @h;
816 1086
817 if ($req_h > $h) { 1087 if ($req_h > $h) {
818 # ah well, not enough space 1088 # ah well, not enough space
… …
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h; 1099 $h[$_] = $alloc_h;
830 } 1100 }
831 } 1101 }
832 1102
1103 CFClient::UI::harmonize \@h;
1104
833 my $y = 0; 1105 my $y = 0;
834 for (0 .. $#$children) { 1106 for (0 .. $#$children) {
835 my $child = $children->[$_]; 1107 my $child = $children->[$_];
836 my $h = $h[$_]; 1108 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w); 1109 $child->configure ($y, 0, $h, $w);
838 1110
839 $y += $h; 1111 $y += $h;
840 } 1112 }
1113
1114 1
841} 1115}
842 1116
843############################################################################# 1117#############################################################################
844 1118
845package CFClient::UI::VBox; 1119package CFClient::UI::VBox;
… …
858 (List::Util::sum map $_->[1], @alloc), 1132 (List::Util::sum map $_->[1], @alloc),
859 ) 1133 )
860} 1134}
861 1135
862sub size_allocate { 1136sub size_allocate {
863 my ($self, $x, $y, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
864
865 $self->_size_allocate ($x, $y, $w, $h);
866 1138
867 my $children = $self->{children}; 1139 my $children = $self->{children};
868 1140
869 my @h = map +($_->size_request)[1], @$children; 1141 my @h = map $_->{req_h}, @$children;
870 1142
871 my $req_h = List::Util::sum @h; 1143 my $req_h = List::Util::sum @h;
872 1144
873 if ($req_h > $h) { 1145 if ($req_h > $h) {
874 # ah well, not enough space 1146 # ah well, not enough space
… …
882 1154
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884 } 1156 }
885 } 1157 }
886 1158
1159 CFClient::UI::harmonize \@h;
1160
887 my $y = 0; 1161 my $y = 0;
888 for (0 .. $#$children) { 1162 for (0 .. $#$children) {
889 my $child = $children->[$_]; 1163 my $child = $children->[$_];
890 my $h = $h[$_]; 1164 my $h = $h[$_];
891 $child->size_allocate (0, $y, $w, $h); 1165 $child->configure (0, $y, $w, $h);
892 1166
893 $y += $h; 1167 $y += $h;
894 } 1168 }
1169
1170 1
895} 1171}
896 1172
897############################################################################# 1173#############################################################################
898 1174
899package CFClient::UI::Label; 1175package CFClient::UI::Label;
900 1176
901our @ISA = CFClient::UI::Base::; 1177our @ISA = CFClient::UI::Base::;
902 1178
903use SDL::OpenGL; 1179use CFClient::OpenGL;
904 1180
905sub new { 1181sub new {
906 my ($class, %arg) = @_; 1182 my ($class, %arg) = @_;
907 1183
908 my $self = $class->SUPER::new ( 1184 my $self = $class->SUPER::new (
909 fg => [1, 1, 1], 1185 fg => [1, 1, 1],
910 height => $::FONTSIZE, 1186 #font => default_font
1187 fontsize => 1,
911 text => "", 1188 text => "",
912 align => -1, 1189 align => -1,
1190 valign => -1,
913 padding => 2, 1191 padding => 2,
914 layout => new CFClient::Layout, 1192 layout => new CFClient::Layout,
1193 can_events => 0,
915 %arg 1194 %arg
916 ); 1195 );
917 1196
918 $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};
919 1205
920 $self 1206 $self
921} 1207}
922 1208
923sub escape_text { 1209sub escape {
924 local $_ = $_[1]; 1210 local $_ = $_[1];
925 1211
926 s/&/&amp;/g; 1212 s/&/&amp;/g;
927 s/>/&gt;/g; 1213 s/>/&gt;/g;
928 s/</&lt;/g; 1214 s/</&lt;/g;
929 1215
930 $_[1] 1216 $_[1]
931} 1217}
932 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
933sub set_text { 1232sub set_text {
934 my ($self, $text) = @_; 1233 my ($self, $text) = @_;
935 1234
1235 return if $self->{text} eq "T$text";
936 $self->{text} = $text; 1236 $self->{text} = "T$text";
1237
937 $self->{layout}->set_markup ($text); 1238 $self->{layout}->set_text ($text);
938 1239
939 delete $self->{texture}; 1240 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update; 1241 $self->update;
1242 $self->check_size;
942} 1243}
943 1244
944sub get_text { 1245sub set_markup {
945 my ($self, $text) = @_; 1246 my ($self, $markup) = @_;
946 1247
947 $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;
948} 1256}
949 1257
950sub size_request { 1258sub size_request {
951 my ($self) = @_; 1259 my ($self) = @_;
952 1260
953 $self->{layout}->set_width; 1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
954 $self->{layout}->set_height ($self->{height}); 1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264
955 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 }
956 1276
957 ( 1277 (
958 $w + $self->{padding} * 2, 1278 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2, 1279 $h + $self->{padding} * 2,
960 ) 1280 )
961} 1281}
962 1282
963sub size_allocate { 1283sub size_allocate {
964 my ($self, $x, $y, $w, $h) = @_; 1284 my ($self, $w, $h) = @_;
965
966 $self->_size_allocate ($x, $y, $w, $h) or return;
967 1285
968 delete $self->{texture}; 1286 delete $self->{texture};
969} 1287}
970 1288
971sub update { 1289sub set_fontsize {
972 my ($self) = @_; 1290 my ($self, $fontsize) = @_;
973 1291
1292 $self->{fontsize} = $fontsize;
974 delete $self->{texture}; 1293 delete $self->{texture};
1294 $self->check_size;
975 $self->SUPER::update; 1295 $self->update;
976} 1296}
977 1297
978sub _draw { 1298sub _draw {
979 my ($self) = @_; 1299 my ($self) = @_;
980 1300
981 my $tex = $self->{texture} ||= do { 1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
982 $self->{layout}->set_width ($self->{w}); 1303 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
984 new_from_layout CFClient::Texture $self->{layout} 1305 new_from_layout CFClient::Texture $self->{layout}
985 }; 1306 };
986 1307
987 glEnable GL_BLEND; 1308 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 1310 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 1312
992 glColor @{$self->{fg}}; 1313 glColor @{$self->{fg}};
993 1314
994 my $x = 1315 $self->{ox} = int (
995 $self->{align} < 0 ? $self->{padding} 1316 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
998 1320
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1321 $self->{oy} = int (
1000 $tex->draw_quad (0, 0); 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});
1001 1328
1002 glDisable GL_TEXTURE_2D; 1329 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1330 glDisable GL_BLEND;
1004} 1331}
1005 1332
1006############################################################################# 1333#############################################################################
1007 1334
1008package CFClient::UI::Entry; 1335package CFClient::UI::EntryBase;
1009 1336
1010our @ISA = CFClient::UI::Label::; 1337our @ISA = CFClient::UI::Label::;
1011 1338
1012use SDL; 1339use CFClient::OpenGL;
1013use SDL::OpenGL;
1014 1340
1015sub new { 1341sub new {
1016 my $class = shift; 1342 my $class = shift;
1017 1343
1018 $class->SUPER::new ( 1344 $class->SUPER::new (
1019 fg => [1, 1, 1], 1345 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2], 1346 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1347 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1348 active_fg => [0, 0, 0],
1023 can_hover => 1, 1349 can_hover => 1,
1024 can_focus => 1, 1350 can_focus => 1,
1351 valign => 0,
1352 can_events => 1,
1025 @_ 1353 @_
1026 ) 1354 )
1027} 1355}
1028 1356
1029sub _set_text { 1357sub _set_text {
1030 my ($self, $text) = @_; 1358 my ($self, $text) = @_;
1031 1359
1032 my $old_text = $self->{text}; 1360 delete $self->{cur_h};
1361
1362 return if $self->{text} eq $text;
1363
1364 delete $self->{texture};
1033 1365
1034 $self->{last_activity} = $::NOW; 1366 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1367 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039 1368
1040 $text =~ s/./*/g if $self->{hidden}; 1369 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text ");
1041 1371
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1372 $self->emit (changed => $self->{text});
1373}
1043 1374
1044 $text = substr $text, 0, $self->{cursor}; 1375sub get_text {
1045 utf8::encode $text; 1376 $_[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} 1377}
1052 1378
1053sub size_request { 1379sub size_request {
1054 my ($self) = @_; 1380 my ($self) = @_;
1055 1381
… …
1057 1383
1058 ($w + 1, $h) # add 1 for cursor 1384 ($w + 1, $h) # add 1 for cursor
1059} 1385}
1060 1386
1061sub size_allocate { 1387sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1388 my ($self, $w, $h) = @_;
1063 1389
1064 $self->SUPER::size_allocate ($x, $y, $w, $h); 1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1065
1066 $self->_set_text ($self->{text});
1067} 1391}
1068 1392
1069sub set_text { 1393sub set_text {
1070 my ($self, $text) = @_; 1394 my ($self, $text) = @_;
1071 1395
… …
1075} 1399}
1076 1400
1077sub key_down { 1401sub key_down {
1078 my ($self, $ev) = @_; 1402 my ($self, $ev) = @_;
1079 1403
1080 my $mod = $ev->key_mod; 1404 my $mod = $ev->{mod};
1081 my $sym = $ev->key_sym; 1405 my $sym = $ev->{sym};
1082
1083 my $uni = $ev->key_unicode; 1406 my $uni = $ev->{unicode};
1084 1407
1085 my $text = $self->get_text; 1408 my $text = $self->get_text;
1086 1409
1087 if ($sym == SDLK_BACKSPACE) { 1410 if ($sym == 8) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) { 1412 } elsif ($sym == 127) {
1090 substr $text, $self->{cursor}, 1, ""; 1413 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) { 1414 } elsif ($sym == CFClient::SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor}; 1415 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) { 1416 } elsif ($sym == CFClient::SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1417 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) { 1418 } elsif ($sym == CFClient::SDLK_HOME) {
1096 $self->{cursor} = 0; 1419 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) { 1420 } elsif ($sym == CFClient::SDLK_END) {
1098 $self->{cursor} = length $text; 1421 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) { 1422 } elsif ($sym == 27) {
1100 $self->emit ('escape'); 1423 $self->emit ('escape');
1101 } elsif ($uni) { 1424 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni; 1425 substr $text, $self->{cursor}++, 0, chr $uni;
1103 } 1426 }
1104 1427
… …
1159 1482
1160 $self->SUPER::_draw; 1483 $self->SUPER::_draw;
1161 1484
1162 #TODO: force update every cursor change :( 1485 #TODO: force update every cursor change :(
1163 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
1164 glColor @{$self->{fg}}; 1495 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1496 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 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};
1168 glEnd; 1499 glEnd;
1169 } 1500 }
1170} 1501}
1171 1502
1172package CFClient::UI::LineEntry; 1503package CFClient::UI::Entry;
1173 1504
1174our @ISA = CFClient::UI::Entry::; 1505our @ISA = CFClient::UI::EntryBase::;
1175 1506
1176use SDL; 1507use CFClient::OpenGL;
1177use SDL::OpenGL;
1178 1508
1179sub key_down { 1509sub key_down {
1180 my ($self, $ev) = @_; 1510 my ($self, $ev) = @_;
1181 1511
1182 my $sym = $ev->key_sym; 1512 my $sym = $ev->{sym};
1183 1513
1184 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} = '';
1185 $self->emit (activate => $self->get_text); 1519 $self->emit (activate => $txt);
1186 $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 }
1187 1543
1188 } else { 1544 } else {
1189 $self->SUPER::key_down ($ev); 1545 $self->SUPER::key_down ($ev);
1190 } 1546 }
1191 1547
… …
1195 1551
1196package CFClient::UI::Button; 1552package CFClient::UI::Button;
1197 1553
1198our @ISA = CFClient::UI::Label::; 1554our @ISA = CFClient::UI::Label::;
1199 1555
1200use SDL; 1556use CFClient::OpenGL;
1201use SDL::OpenGL;
1202 1557
1203my @tex = 1558my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1205 qw(b1_button_active.png); 1560 qw(b1_button_active.png);
1206 1561
1207sub new { 1562sub new {
1208 my $class = shift; 1563 my $class = shift;
1209 1564
1210 $class->SUPER::new ( 1565 $class->SUPER::new (
1211 padding => 4, 1566 padding => 4,
1212 fg => [1, 1, 1], 1567 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1568 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1569 active_fg => [0, 0, 1],
1215 can_hover => 1, 1570 can_hover => 1,
1571 align => 0,
1572 valign => 0,
1573 can_events => 1,
1216 @_ 1574 @_
1217 ) 1575 )
1218} 1576}
1219 1577
1220sub button_up { 1578sub button_up {
… …
1228 1586
1229sub _draw { 1587sub _draw {
1230 my ($self) = @_; 1588 my ($self) = @_;
1231 1589
1232 local $self->{fg} = $self->{fg}; 1590 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 1591
1239 if ($GRAB == $self) { 1592 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1593 $self->{fg} = $self->{active_fg};
1241 } 1594 }
1242 1595
1243 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;
1244 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;
1245 1601
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1603
1248 glDisable GL_TEXTURE_2D; 1604 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1605 glDisable GL_BLEND;
1250 1606
1251 $self->SUPER::_draw; 1607 $self->SUPER::_draw;
… …
1256package CFClient::UI::CheckBox; 1612package CFClient::UI::CheckBox;
1257 1613
1258our @ISA = CFClient::UI::DrawBG::; 1614our @ISA = CFClient::UI::DrawBG::;
1259 1615
1260my @tex = 1616my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1618 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263 1619
1264use SDL; 1620use CFClient::OpenGL;
1265use SDL::OpenGL;
1266 1621
1267sub new { 1622sub new {
1268 my $class = shift; 1623 my $class = shift;
1269 1624
1270 $class->SUPER::new ( 1625 $class->SUPER::new (
… …
1281 my ($self) = @_; 1636 my ($self) = @_;
1282 1637
1283 ($self->{padding} * 2 + 6) x 2 1638 ($self->{padding} * 2 + 6) x 2
1284} 1639}
1285 1640
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down { 1641sub button_down {
1293 my ($self, $ev, $x, $y) = @_; 1642 my ($self, $ev, $x, $y) = @_;
1294 1643
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1322 glDisable GL_BLEND; 1671 glDisable GL_BLEND;
1323} 1672}
1324 1673
1325############################################################################# 1674#############################################################################
1326 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
1327package CFClient::UI::Slider; 1915package CFClient::UI::Slider;
1328 1916
1329use strict; 1917use strict;
1330 1918
1331use SDL::OpenGL; 1919use CFClient::OpenGL;
1332 1920
1333our @ISA = CFClient::UI::DrawBG::; 1921our @ISA = CFClient::UI::DrawBG::;
1334 1922
1335my @tex = 1923my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1924 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1346 # TODO: calculations are off 1934 # TODO: calculations are off
1347 my $self = $class->SUPER::new ( 1935 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1], 1936 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0], 1937 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10], 1938 range => [0, 0, 100, 10],
1351 req_w => 40, 1939 req_w => 20,
1352 req_h => 13, 1940 req_h => 20,
1353 vertical => 0, 1941 vertical => 0,
1354 can_hover => 1, 1942 can_hover => 1,
1943 inner_pad => 5,
1355 @_ 1944 @_
1356 ); 1945 );
1357 1946
1358 $self 1947 $self
1359} 1948}
… …
1380 if ($GRAB == $self) { 1969 if ($GRAB == $self) {
1381 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1970 my ($value, $lo, $hi, $page) = @{$self->{range}};
1382 1971
1383 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1384 1973
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976
1977 $x -= $inner_pad_px; # substract the padding
1385 $x = $x * ($hi - $lo) / $w + $lo; 1978 $x = $x * ($hi - $lo) / $inner_w + $lo;
1386 $x = $lo if $x < $lo; 1979 $x = $lo if $x < $lo;
1387 $x = $hi - $page if $x > $hi - $page; 1980 $x = $hi - $page if $x > $hi - $page;
1388 $self->{range}[0] = $x; 1981 $self->{range}[0] = $x;
1389 1982
1390 $self->emit (changed => $x); 1983 $self->emit (changed => $x);
1391 $self->update; 1984 $self->update;
1392 } 1985 }
1986}
1987
1988# the inner_* stuff is for generating a padding for the slider handle,
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1393} 1994}
1394 1995
1395sub _draw { 1996sub _draw {
1396 my ($self) = @_; 1997 my ($self) = @_;
1397 1998
… …
1411 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1412 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1413 2014
1414 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
1415 2016
1416 # the inner_* stuff is for generating a padding for the slider handle, 2017 $hi = $value + 1 if $lo == $hi;
1417 # so that the handle doesn't leave the texture. This calculation isn't 100% 2018
1418 # correct propably, but it does the job for now 2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1419 my $inner_pad = 5; # 5% of width for slider bg texture border
1420 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1421 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1422 2021
1423 $page = int $page * $inner_w / ($hi - $lo); 2022 $page = int $page * $inner_w / ($hi - $lo);
1424 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1425 2024
1426 $w -= $page; 2025 $w -= $page;
… …
1450 2049
1451package CFClient::UI::TextView; 2050package CFClient::UI::TextView;
1452 2051
1453our @ISA = CFClient::UI::HBox::; 2052our @ISA = CFClient::UI::HBox::;
1454 2053
1455use SDL::OpenGL; 2054use CFClient::OpenGL;
1456 2055
1457sub new { 2056sub new {
1458 my $class = shift; 2057 my $class = shift;
1459 2058
1460 my $self = $class->SUPER::new ( 2059 my $self = $class->SUPER::new (
1461 par => [], 2060 fontsize => 1,
2061 can_events => 0,
2062 #font => default_font
1462 @_, 2063 @_,
2064
2065 layout => (new CFClient::Layout),
2066 par => [],
2067 height => 0,
1463 children => [ 2068 children => [
1464 (new CFClient::UI::Empty expand => 1), 2069 (new CFClient::UI::Empty expand => 1),
1465 (new CFClient::UI::Slider vertical => 1), 2070 (new CFClient::UI::Slider vertical => 1),
1466 ], 2071 ],
1467 ); 2072 );
1468 2073
2074 $self->{children}[1]->connect (changed => sub {
2075 $self->update;
2076 });
2077
1469 $self 2078 $self
2079}
2080
2081sub set_fontsize {
2082 my ($self, $fontsize) = @_;
2083
2084 $self->{fontsize} = $fontsize;
2085 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105}
2106
2107sub size_allocate {
2108 my ($self, $w, $h) = @_;
2109
2110 $self->SUPER::size_allocate ($w, $h);
2111
2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2114 $self->{layout}->set_width ($self->{children}[0]{w});
2115
2116 $self->reflow;
1470} 2117}
1471 2118
1472sub add_paragraph { 2119sub add_paragraph {
1473 my ($self, $color, $text) = @_; 2120 my ($self, $color, $text) = @_;
1474 2121
2122 #TODO: intelligently "reformat" paragraph
2123
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height;
2127
1475 push @{$self->{par}}, [$color, $text]; 2128 push @{$self->{par}}, [$height, $color, $text];
1476 my $count = scalar @{$self->{par}}; 2129
1477 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 2130 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1478 $self->{children}[1]->update; 2131 $self->{children}[1]->update;
1479} 2132}
1480 2133
2134sub update {
2135 my ($self) = @_;
2136
2137 $self->SUPER::update;
2138
2139 return unless $self->{h} > 0;
2140
2141 delete $self->{texture};
2142
2143 $ROOT->on_refresh ($self, sub {
2144 if (delete $self->{need_reflow}) {
2145 my $height = 0;
2146
2147 $height += $_->[0] = $self->text_height ($_->[2])
2148 for @{$self->{par}};
2149
2150 $self->{height} = $height;
2151
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153
2154 delete $self->{texture};
2155 }
2156
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
2158 glClearColor 0, 0, 0, 1;
2159 glClear GL_COLOR_BUFFER_BIT;
2160
2161 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
2177 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0];
2179
2180 if ($y0 < $y + $h && $y < $y1) {
2181 $layout->set_text ($par->[2]);
2182
2183 glColor @{ $par->[1] };
2184 my ($W, $H) = $layout->size;
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2186 }
2187
2188 $y += $h;
2189 }
2190
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND;
2193 };
2194 });
2195}
2196
1481sub _draw { 2197sub _draw {
1482 my ($self) = @_; 2198 my ($self) = @_;
1483 2199
1484 my $par = $self->{par}; 2200 if ($self->{texture}) {
1485
1486 my $bottom = (scalar @$par) - 1;
1487
1488 my $w = $self->{children}[0]{w};
1489 my $y = $self->{h};
1490
1491 glEnable GL_BLEND;
1492 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1493 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
1494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1495 2203 glColor 1, 1, 1, 1;
1496 # TODO: everything! 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1497 while ($y > 0 && $bottom >= 0) {
1498 my $par = $par->[$bottom--];
1499
1500 my $layout = new CFClient::Layout;
1501
1502 $layout->set_height ($::FONTSIZE);
1503 $layout->set_width ($w);
1504 $layout->set_text ($par->[1]);
1505 my $tex = new_from_layout CFClient::Texture $layout;
1506 $y -= $tex->{h};
1507
1508 glColor @{ $par->[0] };
1509 $tex->draw_quad (0, $y);
1510 }
1511
1512 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
1513 glDisable GL_BLEND;
1514}
1515
1516#############################################################################
1517
1518package CFClient::UI::MapWidget;
1519
1520use strict;
1521
1522use List::Util qw(min max);
1523
1524use SDL;
1525use SDL::OpenGL;
1526
1527our @ISA = CFClient::UI::Base::;
1528
1529sub new {
1530 my $class = shift;
1531
1532 $class->SUPER::new (
1533 z => -1,
1534 can_focus => 1,
1535 list => (glGenLists 1),
1536 @_
1537 ) 2206 }
1538}
1539 2207
1540sub key_down { 2208 $self->{children}[1]->draw;
1541 print "MAPKEYDOWN\n";
1542}
1543 2209
1544sub key_up {
1545}
1546
1547sub size_request {
1548 (
1549 1 + 32 * int $::WIDTH / 32,
1550 1 + 32 * int $::HEIGHT / 32,
1551 )
1552}
1553
1554sub update {
1555 my ($self) = @_;
1556
1557 $self->{need_update} = 1;
1558 $self->SUPER::update;
1559}
1560
1561sub draw {
1562 my ($self) = @_;
1563
1564 $self->{need_update}++;#d#
1565 if (delete $self->{need_update}) {
1566 glNewList $self->{list}, GL_COMPILE;
1567
1568 my $sw = int $::WIDTH / 32;
1569 my $sh = int $::HEIGHT / 32;
1570
1571 if ($::MAP) {
1572 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1573
1574 if ($::CFG->{fow_enable}) {
1575 if ($::CFG->{fow_smooth}) { # smooth fog of war
1576 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1577 glConvolutionFilter2D
1578 GL_CONVOLUTION_2D,
1579 GL_ALPHA,
1580 3, 3,
1581 GL_ALPHA, GL_FLOAT,
1582 pack "f*",
1583 0.1, 0.1, 0.1,
1584 0.1, 0.2, 0.1,
1585 0.1, 0.1, 0.1,
1586 ;
1587 glEnable GL_CONVOLUTION_2D;
1588 }
1589
1590 my $tex = new CFClient::Texture
1591 w => $w,
1592 h => $h,
1593 data => $data,
1594 internalformat => GL_ALPHA,
1595 format => GL_ALPHA;
1596
1597 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1598
1599 glEnable GL_BLEND;
1600 glEnable GL_TEXTURE_2D;
1601 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1602
1603 glColor +($::CFG->{fow_intensity}) x 3, 1;
1604 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1605
1606 glDisable GL_TEXTURE_2D;
1607 glDisable GL_BLEND;
1608 }
1609 }
1610
1611 glEndList;
1612 }
1613
1614 glCallList $self->{list};
1615
1616 if ($FOCUS != $self) {
1617 glColor 64/255, 64/255, 64/255;
1618 glLogicOp GL_AND;
1619 glEnable GL_COLOR_LOGIC_OP;
1620 glBegin GL_QUADS;
1621 glVertex 0, 0;
1622 glVertex 0, $::HEIGHT;
1623 glVertex $::WIDTH, $::HEIGHT;
1624 glVertex $::WIDTH, 0;
1625 glEnd;
1626 glDisable GL_COLOR_LOGIC_OP;
1627 }
1628}
1629
1630my %DIR = (
1631 SDLK_KP8, [1, "north"],
1632 SDLK_KP9, [2, "northeast"],
1633 SDLK_KP6, [3, "east"],
1634 SDLK_KP3, [4, "southeast"],
1635 SDLK_KP2, [5, "south"],
1636 SDLK_KP1, [6, "southwest"],
1637 SDLK_KP4, [7, "west"],
1638 SDLK_KP7, [8, "northwest"],
1639
1640 SDLK_UP, [1, "north"],
1641 SDLK_RIGHT, [3, "east"],
1642 SDLK_DOWN, [5, "south"],
1643 SDLK_LEFT, [7, "west"],
1644);
1645
1646sub key_down {
1647 my ($self, $ev) = @_;
1648
1649 my $mod = $ev->key_mod;
1650 my $sym = $ev->key_sym;
1651
1652 if ($sym == SDLK_KP5) {
1653 $::CONN->user_send ("command stay fire");
1654 } elsif ($sym == SDLK_a) {
1655 $::CONN->user_send ("command apply");
1656 } elsif ($sym == SDLK_QUOTE) {
1657 $self->emit ('activate_console');
1658 } elsif (exists $DIR{$sym}) {
1659 if ($mod & KMOD_SHIFT) {
1660 $self->{shft}++;
1661 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1662 } elsif ($mod & KMOD_CTRL) {
1663 $self->{ctrl}++;
1664 $::CONN->user_send ("command run $DIR{$sym}[0]");
1665 } else {
1666 $::CONN->user_send ("command $DIR{$sym}[1]");
1667 }
1668 }
1669}
1670
1671sub key_up {
1672 my ($self, $ev) = @_;
1673
1674 my $mod = $ev->key_mod;
1675 my $sym = $ev->key_sym;
1676
1677 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1678 $::CONN->user_send ("command fire_stop");
1679 }
1680 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1681 $::CONN->user_send ("command run_stop");
1682 }
1683} 2210}
1684 2211
1685############################################################################# 2212#############################################################################
1686 2213
1687package CFClient::UI::Animator; 2214package CFClient::UI::Animator;
1688 2215
1689use SDL::OpenGL; 2216use CFClient::OpenGL;
1690 2217
1691our @ISA = CFClient::UI::Bin::; 2218our @ISA = CFClient::UI::Bin::;
1692 2219
1693sub moveto { 2220sub moveto {
1694 my ($self, $x, $y) = @_; 2221 my ($self, $x, $y) = @_;
… …
1732 2259
1733sub new { 2260sub new {
1734 my $class = shift; 2261 my $class = shift;
1735 2262
1736 my $self = $class->SUPER::new ( 2263 my $self = $class->SUPER::new (
1737 state => 0, 2264 state => 0,
1738 connect_activate => \&toggle_flopper, 2265 connect_activate => \&toggle_flopper,
1739 @_ 2266 @_
1740 ); 2267 );
1741 2268
1742 if ($self->{state}) { 2269 if ($self->{state}) {
… …
1750sub toggle_flopper { 2277sub toggle_flopper {
1751 my ($self) = @_; 2278 my ($self) = @_;
1752 2279
1753 # TODO: use animation 2280 # TODO: use animation
1754 if ($self->{state} = !$self->{state}) { 2281 if ($self->{state} = !$self->{state}) {
1755 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2282 $CFClient::UI::ROOT->add ($self->{other});
1756 $self->{other}->move ( 2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
1757 ($::WIDTH - $self->{other}{w}) * 0.5, 2284 $self->emit ("open");
1758 ($::HEIGHT - $self->{other}{h}) * 0.5,
1759 );
1760 } else { 2285 } else {
1761 $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;
1762 } 2349
1763} 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;
1764 2359
1765############################################################################# 2360 glTranslate 2, 2;
2361 $self->SUPER::_draw;
2362}
1766 2363
2364#############################################################################
2365
1767package 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;
1768 2405
1769our @ISA = CFClient::UI::Container::; 2406our @ISA = CFClient::UI::Container::;
2407
2408use CFClient::OpenGL;
2409
2410sub check_size {
2411 my ($self) = @_;
2412
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2414}
1770 2415
1771sub size_request { 2416sub size_request {
1772 ($::WIDTH, $::HEIGHT) 2417 ($::WIDTH, $::HEIGHT)
1773} 2418}
1774 2419
1775sub size_allocate { 2420sub configure {
1776 my ($self, $x, $y, $w, $h) = @_; 2421 my ($self, $x, $y, $w, $h) = @_;
1777 2422
1778 $self->_size_allocate ($x, $y, $w, $h); 2423 $self->SUPER::configure ($x, $y, $w, $h);
1779 2424
1780 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1781 for @{$self->{children}}; 2425 for my $child (@{$self->{children}}) {
1782} 2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1783 2427
1784sub 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 {
1785 my ($self, $x, $y) = @_; 2435 my ($self, $x, $y) = @_;
1786 2436
1787 ($x, $y) 2437 ($x, $y)
1788} 2438}
1789 2439
1790sub update { 2440sub update {
1791 my ($self) = @_; 2441 my ($self) = @_;
1792 2442
1793 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2443 $self->check_size;
1794 ::refresh (); 2444 ::refresh ();
1795} 2445}
1796 2446
1797sub add { 2447sub add {
1798 my ($self, $widget) = @_; 2448 my ($self, $child) = @_;
1799 2449
2450 # integerize window positions
2451 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y};
2453
1800 $self->SUPER::add ($widget); 2454 $self->SUPER::add ($child);
2455}
1801 2456
1802 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2457sub on_refresh {
2458 my ($self, $id, $cb) = @_;
2459
2460 $self->{refresh_hook}{$id} = $cb;
1803} 2461}
1804 2462
1805sub draw { 2463sub draw {
1806 my ($self) = @_; 2464 my ($self) = @_;
1807 2465
2466 while (my $rcb = delete $self->{refresh_hook}) {
2467 $_->() for values %$rcb;
2468 }
2469
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT;
2473
2474 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2477 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity;
2479
1808 $self->_draw; 2480 $self->_draw;
1809} 2481}
1810 2482
1811############################################################################# 2483#############################################################################
1812 2484
1813package CFClient::UI; 2485package CFClient::UI;
1814 2486
2487$ROOT = new CFClient::UI::Root;
1815$TOPLEVEL = new CFClient::UI::Toplevel; 2488$TOOLTIP = new CFClient::UI::Tooltip;
1816 2489
18171 24901
1818 2491

Diff Legend

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