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.123 by root, Mon Apr 17 19:50:22 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
18
19sub check_tooltip {
20 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) {
25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 }
43
44 return;
45 }
46 }
47 }
48
49 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner};
51}
14 52
15# class methods for events 53# class methods for events
16sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
18} 57}
19 58
20sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
22} 62}
23 63
24sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
25 my ($ev) = @_; 65 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
27 67
28 if (!$BUTTON_STATE) { 68 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 69 my $widget = $ROOT->find_widget ($x, $y);
30 70
31 $GRAB = $widget; 71 $GRAB = $widget;
32 $GRAB->update if $GRAB; 72 $GRAB->update if $GRAB;
33 }
34 73
74 check_tooltip;
75 }
76
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 78
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
38} 83}
39 84
40sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
41 my ($ev) = @_; 86 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
43 88
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 90
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 92
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
49 97
50 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 100 $grab->update if $grab;
53 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
102
103 check_tooltip;
54 } 104 }
55} 105}
56 106
57sub feed_sdl_motion_event { 107sub feed_sdl_motion_event {
58 my ($ev) = @_; 108 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 109 my ($x, $y) = ($ev->{x}, $ev->{y});
60 110
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 111 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 112
63 if ($widget != $HOVER) { 113 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 114 my $hover = $HOVER; $HOVER = $widget;
65 115
66 $hover->update if $hover && $hover->{can_hover}; 116 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 118
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 check_tooltip;
120 }
121
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
71} 126}
72 127
73# convert position array to integers 128# convert position array to integers
74sub harmonize { 129sub harmonize {
75 my ($vals) = @_; 130 my ($vals) = @_;
… …
81 $rem += $_ - $i; 136 $rem += $_ - $i;
82 $_ = $i; 137 $_ = $i;
83 } 138 }
84} 139}
85 140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
169 }
170}
171
86############################################################################# 172#############################################################################
87 173
88package CFClient::UI::Base; 174package CFClient::UI::Base;
89 175
90use strict; 176use strict;
91 177
92use SDL::OpenGL; 178use CFClient::OpenGL;
93 179
94sub new { 180sub new {
95 my $class = shift; 181 my $class = shift;
96 182
97 my $self = bless { 183 my $self = bless {
98 x => 0, 184 x => 0,
99 y => 0, 185 y => 0,
100 z => 0, 186 z => 0,
101 w => -1, 187 can_events => 1,
102 h => -1,
103 @_ 188 @_
104 }, $class; 189 }, $class;
105 190
106 for (keys %$self) { 191 for (keys %$self) {
107 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
109 } 194 }
110 } 195 }
111 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
112 $self 199 $self
200}
201
202sub destroy {
203 my ($self) = @_;
204
205 $self->hide;
206 %$self = ();
207}
208
209sub show {
210 my ($self) = @_;
211
212 return if $self->{parent};
213
214 $CFClient::UI::ROOT->add ($self);
215}
216
217sub hide {
218 my ($self) = @_;
219
220 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self;
222
223 $self->{parent}->remove ($self)
224 if $self->{parent};
113} 225}
114 226
115sub move { 227sub move {
116 my ($self, $x, $y, $z) = @_; 228 my ($self, $x, $y, $z) = @_;
229
117 $self->{x} = int $x; 230 $self->{x} = int $x;
118 $self->{y} = int $y; 231 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 232 $self->{z} = $z if defined $z;
120}
121 233
122sub needs_redraw { 234 $self->update;
123 0 235}
236
237sub set_size {
238 my ($self, $w, $h) = @_;
239
240 $self->{user_w} = $w;
241 $self->{user_h} = $h;
242
243 $self->check_size;
124} 244}
125 245
126sub size_request { 246sub size_request {
127 require Carp; 247 require Carp;
128 Carp::confess "size_request is abtract"; 248 Carp::confess "size_request is abstract";
129} 249}
130 250
131sub _size_allocate { 251sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 252 my ($self, $x, $y, $w, $h) = @_;
133 253
254 if ($self->{aspect}) {
255 my $w2 = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect};
257
258 # use alignment to adjust x, y
259
260 $x += int +($w - $w2) * 0.5;
261 $y += int +($h - $h2) * 0.5;
262
263 ($w, $h) = ($w2, $h2);
264 }
265
266 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 267 $self->{x} = $x;
135 $self->{y} = $y; 268 $self->{y} = $y;
269 $self->update;
270 }
136 271
137 return unless $self->{w} != $w || $self->{h} != $h; 272 if ($self->{w} != $w || $self->{h} != $h) {
138 273 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
139 $self->{w} = $w;
140 $self->{h} = $h;
141
142 1 274 }
143} 275}
144 276
145sub size_allocate { 277sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 278 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 279}
150 280
151# return top left coordinates 281sub reconfigure {
152sub _topleft { 282 my ($self) = @_;
283
284 $self->check_size (1);
285 $self->update;
286}
287
288sub children {
289}
290
291sub set_max_size {
153 my ($self, $x, $y) = @_; 292 my ($self, $w, $h) = @_;
154 293
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 294 delete $self->{max_w}; $self->{max_w} = $w if $w;
295 delete $self->{max_h}; $self->{max_h} = $h if $h;
296}
297
298sub set_tooltip {
299 my ($self, $tooltip) = @_;
300
301 $self->{tooltip} = $tooltip;
302
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip;
306 }
156} 307}
157 308
158# translate global coordinates to local coordinate system 309# translate global coordinates to local coordinate system
159sub coord2local { 310sub coord2local {
160 my ($self, $x, $y) = @_; 311 my ($self, $x, $y) = @_;
161 312
162 my ($X, $Y) = $self->_topleft; 313 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
163 ($x - $X, $y - $Y)
164} 314}
165 315
166# translate local coordinates to global coordinate system 316# translate local coordinates to global coordinate system
167sub coord2global { 317sub coord2global {
168 my ($self, $x, $y) = @_; 318 my ($self, $x, $y) = @_;
169 319
170 my ($X, $Y) = $self->_topleft; 320 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
171 ($x + $X, $y + $Y)
172} 321}
173 322
174sub focus_in { 323sub focus_in {
175 my ($self) = @_; 324 my ($self) = @_;
176 325
… …
236 glVertex $x + $self->{w}, $y + $self->{h}; 385 glVertex $x + $self->{w}, $y + $self->{h};
237 glVertex $x , $y + $self->{h}; 386 glVertex $x , $y + $self->{h};
238 glEnd; 387 glEnd;
239 glDisable GL_BLEND; 388 glDisable GL_BLEND;
240 } 389 }
390
391 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix;
393 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0;
397 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h};
400 glEnd;
401 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 }
241} 404}
242 405
243sub _draw { 406sub _draw {
244 my ($self) = @_; 407 my ($self) = @_;
245 408
246 warn "no draw defined for $self\n"; 409 warn "no draw defined for $self\n";
247} 410}
248 411
249sub find_widget { 412sub find_widget {
250 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
251 416
252 return $self 417 return $self
253 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
255 420
… …
258 423
259sub set_parent { 424sub set_parent {
260 my ($self, $parent) = @_; 425 my ($self, $parent) = @_;
261 426
262 Scalar::Util::weaken ($self->{parent} = $parent); 427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
263} 439}
264 440
265sub update { 441sub update {
266 my ($self) = @_; 442 my ($self) = @_;
267 443
… …
270} 446}
271 447
272sub connect { 448sub connect {
273 my ($self, $signal, $cb) = @_; 449 my ($self, $signal, $cb) = @_;
274 450
275 push @{ $self->{cb}{$signal} }, $cb; 451 push @{ $self->{signal_cb}{$signal} }, $cb;
276} 452}
277 453
278sub emit { 454sub emit {
279 my ($self, $signal, @args) = @_; 455 my ($self, $signal, @args) = @_;
280 456
281 $_->($self, @args) 457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
282 for @{$self->{cb}{$signal} || []};
283} 458}
284 459
285sub DESTROY { 460sub DESTROY {
286 my ($self) = @_; 461 my ($self) = @_;
287 462
463 delete $WIDGET{$self+0};
288 #$self->deactivate; 464 #$self->deactivate;
289} 465}
290 466
291############################################################################# 467#############################################################################
292 468
293package CFClient::UI::DrawBG; 469package CFClient::UI::DrawBG;
294 470
295our @ISA = CFClient::UI::Base::; 471our @ISA = CFClient::UI::Base::;
296 472
297use strict; 473use strict;
298use SDL::OpenGL; 474use CFClient::OpenGL;
299 475
300sub new { 476sub new {
301 my $class = shift; 477 my $class = shift;
302 478
303 # range [value, low, high, page] 479 # range [value, low, high, page]
304 480
305 $class->SUPER::new ( 481 $class->SUPER::new (
306 bg => [0, 0, 0, 0.2], 482 #bg => [0, 0, 0, 0.2],
307 active_bg => [1, 1, 1, 0.5], 483 #active_bg => [1, 1, 1, 0.5],
308 @_ 484 @_
309 ) 485 )
310} 486}
311 487
312sub _draw { 488sub _draw {
313 my ($self) = @_; 489 my ($self) = @_;
314 490
491 my $color = $FOCUS == $self && $self->{active_bg}
492 ? $self->{active_bg}
493 : $self->{bg};
494
495 if ($color && (@$color < 4 || $color->[3])) {
315 my ($w, $h) = @$self{qw(w h)}; 496 my ($w, $h) = @$self{qw(w h)};
316 497
317 glEnable GL_BLEND; 498 glEnable GL_BLEND;
318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
319 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 500 glColor @$color;
320 501
321 glBegin GL_QUADS; 502 glBegin GL_QUADS;
322 glVertex 0 , 0; 503 glVertex 0 , 0;
323 glVertex 0 , $h; 504 glVertex 0 , $h;
324 glVertex $w, $h; 505 glVertex $w, $h;
325 glVertex $w, 0; 506 glVertex $w, 0;
326 glEnd; 507 glEnd;
327 508
328 glDisable GL_BLEND; 509 glDisable GL_BLEND;
510 }
329} 511}
330 512
331############################################################################# 513#############################################################################
332 514
333package CFClient::UI::Empty; 515package CFClient::UI::Empty;
334 516
335our @ISA = CFClient::UI::Base::; 517our @ISA = CFClient::UI::Base::;
518
519sub new {
520 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg);
522}
336 523
337sub size_request { 524sub size_request {
338 (0, 0) 525 (0, 0)
339} 526}
340 527
… …
349sub new { 536sub new {
350 my ($class, %arg) = @_; 537 my ($class, %arg) = @_;
351 538
352 my $children = delete $arg{children} || []; 539 my $children = delete $arg{children} || [];
353 540
354 my $self = $class->SUPER::new (children => [], %arg); 541 my $self = $class->SUPER::new (
542 children => [],
543 can_events => 0,
544 %arg,
545 );
355 $self->add ($_) for @$children; 546 $self->add ($_) for @$children;
356 547
357 $self 548 $self
358} 549}
359 550
360sub add { 551sub add {
361 my ($self, $child) = @_; 552 my ($self, @widgets) = @_;
362 553
363 $child->set_parent ($self); 554 $_->set_parent ($self)
555 for @widgets;
364 556
365 use sort 'stable'; 557 use sort 'stable';
366 558
367 $self->{children} = [ 559 $self->{children} = [
368 sort { $a->{z} <=> $b->{z} } 560 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 561 @{$self->{children}}, @widgets
370 ]; 562 ];
371 563
372 $self->{w} = $self->{h} = -1; 564 $self->check_size (1);
373 $self->update; 565 $self->update;
374} 566}
375 567
568sub children {
569 @{ $_[0]{children} }
570}
571
376sub remove { 572sub remove {
377 my ($self, $widget) = @_; 573 my ($self, $child) = @_;
378 574
575 delete $child->{parent};
576 $child->hide;
577
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
380 579
381 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 580 $self->check_size;
581 $self->update;
582}
583
584sub clear {
585 my ($self) = @_;
586
587 my $children = delete $self->{children};
588 $self->{children} = [];
589
590 for (@$children) {
591 delete $_->{parent};
592 $_->hide;
593 }
594
595 $self->check_size;
596 $self->update;
382} 597}
383 598
384sub find_widget { 599sub find_widget {
385 my ($self, $x, $y) = @_; 600 my ($self, $x, $y) = @_;
386 601
… …
416 631
417 $class->SUPER::new (children => [$child], %arg) 632 $class->SUPER::new (children => [$child], %arg)
418} 633}
419 634
420sub add { 635sub add {
421 my ($self, $widget) = @_; 636 my ($self, $child) = @_;
422 637
423 $self->{children} = []; 638 $self->{children} = [];
424 639
425 $self->SUPER::add ($widget); 640 $self->SUPER::add ($child);
426} 641}
427 642
428sub remove { 643sub remove {
429 my ($self, $widget) = @_; 644 my ($self, $widget) = @_;
430 645
… …
439sub size_request { 654sub size_request {
440 $_[0]{children}[0]->size_request 655 $_[0]{children}[0]->size_request
441} 656}
442 657
443sub size_allocate { 658sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 659 my ($self, $w, $h) = @_;
445 660
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 661 $self->{children}[0]->configure (0, 0, $w, $h);
449} 662}
450 663
451############################################################################# 664#############################################################################
452 665
453package CFClient::UI::Window; 666package CFClient::UI::Window;
454 667
455our @ISA = CFClient::UI::Bin::; 668our @ISA = CFClient::UI::Bin::;
456 669
457use SDL::OpenGL; 670use CFClient::OpenGL;
458 671
459sub new { 672sub new {
460 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
461 674
462 my $self = $class->SUPER::new (%arg); 675 my $self = $class->SUPER::new (%arg);
463} 676}
464 677
465sub update { 678sub update {
466 my ($self) = @_; 679 my ($self) = @_;
467 680
468 # we want to do this delayed... 681 $ROOT->on_post_alloc ($self => sub { $self->render_child });
469 $self->render_chld;
470 $self->SUPER::update; 682 $self->SUPER::update;
471} 683}
472 684
685sub size_allocate {
686 my ($self, $w, $h) = @_;
687
688 $self->SUPER::size_allocate ($w, $h);
689 $self->update;
690}
691
692sub _render {
693 $_[0]{children}[0]->draw;
694}
695
473sub render_chld { 696sub render_child {
474 my ($self) = @_; 697 my ($self) = @_;
475 698
476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
477 glClearColor 0, 0, 0, 1; 700 glClearColor 0, 0, 0, 0;
478 glClear GL_COLOR_BUFFER_BIT; 701 glClear GL_COLOR_BUFFER_BIT;
479 $self->child->draw; 702
703 $self->_render;
480 }; 704 };
481}
482
483sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_;
485
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h);
489
490 $self->render_chld;
491} 705}
492 706
493sub _draw { 707sub _draw {
494 my ($self) = @_; 708 my ($self) = @_;
495 709
496 my ($w, $h) = ($self->w, $self->h); 710 my ($w, $h) = ($self->w, $self->h);
497 711
498 my $tex = $self->{texture} 712 my $tex = $self->{texture}
499 or return; 713 or return;
500 714
501 glEnable GL_BLEND;
502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
503 glEnable GL_TEXTURE_2D; 715 glEnable GL_TEXTURE_2D;
504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1;
505 718
506 $tex->draw_quad (0, 0, $w, $h); 719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
507 720
508 glDisable GL_BLEND;
509 glDisable GL_TEXTURE_2D; 721 glDisable GL_TEXTURE_2D;
510} 722}
511 723
512############################################################################# 724#############################################################################
513 725
514package CFClient::UI::Frame; 726package CFClient::UI::ViewPort;
515 727
516our @ISA = CFClient::UI::Bin::; 728our @ISA = CFClient::UI::Window::;
517
518use SDL::OpenGL;
519 729
520sub size_request { 730sub size_request {
521 my ($self) = @_; 731 my ($self) = @_;
522 my $chld = $self->child
523 or return (0, 0);
524 732
525 $chld->move (2, 2); 733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
526 735
527 map { $_ + 4 } $chld->size_request; 736 @$self{qw(child_w child_h)}
528} 737}
529 738
530sub size_allocate { 739sub size_allocate {
531 my ($self, $x, $y, $w, $h) = @_; 740 my ($self, $w, $h) = @_;
741
742 $self->update;
743}
744
745sub set_offset {
746 my ($self, $x, $y) = @_;
747
748 $self->{view_x} = int $x;
749 $self->{view_y} = int $y;
750
751 $self->update;
752}
753
754# hmm, this does not work for topleft of $self... but we should not ask for that
755sub coord2local {
756 my ($self, $x, $y) = @_;
757
758 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
759}
760
761sub coord2global {
762 my ($self, $x, $y) = @_;
763
764 $x = List::Util::min $self->{w}, $x - $self->{view_x};
765 $y = List::Util::min $self->{h}, $y - $self->{view_y};
766
767 $self->SUPER::coord2global ($x, $y)
768}
769
770sub find_widget {
771 my ($self, $x, $y) = @_;
772
773 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
774 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
775 ) {
776 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
777 } else {
778 $self->CFClient::UI::Base::find_widget ($x, $y)
532 779 }
533 $self->_size_allocate ($x, $y, $w, $h) or return;
534
535 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
536} 780}
537 781
538sub _draw { 782sub _render {
539 my ($self) = @_; 783 my ($self) = @_;
540 784
541 my $chld = $self->child; 785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
542 786
543 my ($w, $h) = $chld->size_request; 787 $self->SUPER::_render;
544
545 glBegin GL_QUADS;
546 glColor 0, 0, 0;
547 glVertex 0 , 0;
548 glVertex 0 , $h + 4;
549 glVertex $w + 4 , $h + 4;
550 glVertex $w + 4 , 0;
551 glEnd;
552
553 $chld->draw;
554} 788}
555 789
556############################################################################# 790#############################################################################
557 791
558package CFClient::UI::FancyFrame; 792package CFClient::UI::ScrolledWindow;
559 793
560our @ISA = CFClient::UI::Bin::; 794our @ISA = CFClient::UI::HBox::;
561
562use SDL::OpenGL;
563
564my @tex =
565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567 795
568sub new { 796sub new {
569 my $class = shift; 797 my $class = shift;
570 798
799 my $self;
800
801 my $slider = new CFClient::UI::Slider
802 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
806 },
807 ;
808
809 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider,
812 @_,
813 );
814
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider});
818
819 $self
820}
821
822#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll
824
825#############################################################################
826
827package CFClient::UI::Frame;
828
829our @ISA = CFClient::UI::Bin::;
830
831use CFClient::OpenGL;
832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 bg => undef,
838 @_,
839 )
840}
841
842sub _draw {
843 my ($self) = @_;
844
845 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)};
847
848 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} };
851
852 glBegin GL_QUADS;
853 glVertex 0 , 0;
854 glVertex 0 , $h;
855 glVertex $w, $h;
856 glVertex $w, 0;
857 glEnd;
858
859 glDisable GL_BLEND;
860 }
861
862 $self->SUPER::_draw;
863}
864
865#############################################################################
866
867package CFClient::UI::FancyFrame;
868
869our @ISA = CFClient::UI::Bin::;
870
871use CFClient::OpenGL;
872
873my @tex =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876
877sub new {
878 my $class = shift;
879
571 # TODO: user_x, user_y, overwrite moveto? 880 # TODO: user_x, user_y, overwrite moveto?
572 881
573 $class->SUPER::new ( 882 my $self = $class->SUPER::new (
574 bg => [1, 1, 1, 1], 883 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1], 884 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8, 885 border => 0.6,
886 toplevel => 1,
887 can_events => 1,
577 @_ 888 @_
889 );
890
891 $self->{title} &&= new CFClient::UI::Label
892 align => 0,
893 valign => 1,
894 text => $self->{title},
895 fontsize => $self->{border};
896
897 $self
898}
899
900sub border {
901 int $_[0]{border} * $::FONTSIZE
902}
903
904sub size_request {
905 my ($self) = @_;
906
907 my ($w, $h) = $self->SUPER::size_request;
908
909 (
910 $w + $self->border * 2,
911 $h + $self->border * 2,
578 ) 912 )
579} 913}
580 914
581sub size_request {
582 my ($self) = @_;
583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586 my ($w, $h) = $self->SUPER::size_request;
587
588 (
589 $w + $self->{border} * 2,
590 $h + $self->{border} * 2,
591 )
592}
593
594sub size_allocate { 915sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 916 my ($self, $w, $h) = @_;
596 917
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598
599 $h -= List::Util::max 0, $self->{border} * 2; 918 $h -= List::Util::max 0, $self->border * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 919 $w -= List::Util::max 0, $self->border * 2;
601 920
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 924 $self->child->configure ($self->border, $self->border, $w, $h);
603} 925}
604 926
605sub button_down { 927sub button_down {
606 my ($self, $ev, $x, $y) = @_; 928 my ($self, $ev, $x, $y) = @_;
607 929
608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 930 my ($w, $h) = @$self{qw(w h)};
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 931 my $border = $self->border;
610 932
933 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
934 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
935
936 if ($lr & $td) {
937 my ($wx, $wy) = ($self->{x}, $self->{y});
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 938 my ($ox, $oy) = ($ev->{x}, $ev->{y});
612 my ($bw, $bh) = ($self->{w}, $self->{h}); 939 my ($bw, $bh) = ($self->{w}, $self->{h});
940
941 my $mx = $x < $border;
942 my $my = $y < $border;
613 943
614 $self->{motion} = sub { 944 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_; 945 my ($ev, $x, $y) = @_;
616 946
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 947 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy;
618 949
619 $self->{user_w} = $bw + $x - $ox; 950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
620 $self->{user_h} = $bh + $y - $oy; 951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
621 $self->update; 952 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size;
622 }; 954 };
623 955
624 } elsif ($x >= 0 && $x < $self->{w} 956 } elsif ($lr ^ $td) {
625 && $y >= 0 && $y < $self->{border}) {
626
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 957 my ($ox, $oy) = ($ev->{x}, $ev->{y});
628 my ($bx, $by) = ($self->{x}, $self->{y}); 958 my ($bx, $by) = ($self->{x}, $self->{y});
629 959
630 $self->{motion} = sub { 960 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_; 961 my ($ev, $x, $y) = @_;
632 962
633 ($x, $y) = ($ev->motion_x, $ev->motion_y); 963 ($x, $y) = ($ev->{x}, $ev->{y});
634 964
635 $self->move ($bx + $x - $ox, $by + $y - $oy); 965 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update; 966 $self->update;
637 }; 967 };
638 } 968 }
… …
654 my ($self) = @_; 984 my ($self) = @_;
655 985
656 my ($w, $h ) = ($self->{w}, $self->{h}); 986 my ($w, $h ) = ($self->{w}, $self->{h});
657 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
658 988
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 989 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663 991
992 my $border = $self->border;
993
664 glColor @{ $self->{border_bg} }; 994 glColor @{ $self->{border_bg} };
665 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 995 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
669 999
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
670 my $bg = $tex[0]; 1001 my $bg = $tex[0];
671 1002
672 # TODO: repeat texture not scale 1003 # TODO: repeat texture not scale
673 my $rep_x = $cw / $bg->{w}; 1004 my $rep_x = $cw / $bg->{w};
674 my $rep_y = $ch / $bg->{h}; 1005 my $rep_y = $ch / $bg->{h};
675 1006
676 glColor @{ $self->{bg} }; 1007 glColor @{ $self->{bg} };
677 1008
678 $bg->{s} = $rep_x; 1009 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y; 1010 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1; 1011 $bg->{wrap_mode} = 1;
681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 }
682 1014
683 glDisable GL_TEXTURE_2D; 1015 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 1016
1017 $self->{title}->draw if $self->{title};
685 1018
686 $self->child->draw; 1019 $self->child->draw;
687} 1020}
688 1021
689############################################################################# 1022#############################################################################
… …
692 1025
693our @ISA = CFClient::UI::Base::; 1026our @ISA = CFClient::UI::Base::;
694 1027
695use List::Util qw(max sum); 1028use List::Util qw(max sum);
696 1029
697use SDL::OpenGL; 1030use CFClient::OpenGL;
698 1031
699sub new { 1032sub new {
700 my $class = shift; 1033 my $class = shift;
701 1034
702 $class->SUPER::new ( 1035 $class->SUPER::new (
… …
709 my ($self, $x, $y, $child) = @_; 1042 my ($self, $x, $y, $child) = @_;
710 1043
711 $child->set_parent ($self); 1044 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 1045 $self->{children}[$y][$x] = $child;
713 1046
714 $self->{w} = $self->{h} = -1; 1047 $child->check_size;
715 $self->update; 1048}
1049
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
716} 1052}
717 1053
718# TODO: move to container class maybe? send childs a signal on removal? 1054# TODO: move to container class maybe? send childs a signal on removal?
719sub clear { 1055sub clear {
720 my ($self) = @_; 1056 my ($self) = @_;
721 1057
1058 my @children = $self->children;
722 delete $self->{children}; 1059 delete $self->{children};
1060
1061 for (@children) {
1062 delete $_->{parent};
1063 $_->hide;
1064 }
1065
723 $self->update; 1066 $self->update;
724} 1067}
725 1068
726sub get_wh { 1069sub get_wh {
727 my ($self) = @_; 1070 my ($self) = @_;
… …
733 or next; 1076 or next;
734 1077
735 for my $x (0 .. $#$row) { 1078 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x] 1079 my $widget = $row->[$x]
737 or next; 1080 or next;
738 my ($w, $h) = $widget->size_request; 1081 my ($w, $h) = @$widget{qw(req_w req_h)};
739 1082
740 $w[$x] = max $w[$x], $w; 1083 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h; 1084 $h[$y] = max $h[$y], $h;
742 } 1085 }
743 } 1086 }
… …
755 (sum @$hs), 1098 (sum @$hs),
756 ) 1099 )
757} 1100}
758 1101
759sub size_allocate { 1102sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 1103 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 1104
764 my ($ws, $hs) = $self->get_wh; 1105 my ($ws, $hs) = $self->get_wh;
765 1106
766 my $req_w = sum @$ws; 1107 my $req_w = sum @$ws;
767 my $req_h = sum @$hs; 1108 my $req_h = sum @$hs;
… …
789 1130
790 for my $c (0 .. $#$row) { 1131 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 1132 my $col_w = $ws->[$c];
792 1133
793 if (my $widget = $row->[$c]) { 1134 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 1135 $widget->configure ($x, $y, $col_w, $row_h);
795 } 1136 }
796 1137
797 $x += $col_w; 1138 $x += $col_w;
798 } 1139 }
799 1140
… …
844 (List::Util::max map $_->[1], @alloc), 1185 (List::Util::max map $_->[1], @alloc),
845 ) 1186 )
846} 1187}
847 1188
848sub size_allocate { 1189sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852 1191
853 ($h, $w) = ($w, $h); 1192 ($h, $w) = ($w, $h);
854 1193
855 my $children = $self->{children}; 1194 my $children = $self->{children};
856 1195
857 my @h = map +($_->size_request)[0], @$children; 1196 my @h = map $_->{req_w}, @$children;
858 1197
859 my $req_h = List::Util::sum @h; 1198 my $req_h = List::Util::sum @h;
860 1199
861 if ($req_h > $h) { 1200 if ($req_h > $h) {
862 # ah well, not enough space 1201 # ah well, not enough space
… …
878 1217
879 my $y = 0; 1218 my $y = 0;
880 for (0 .. $#$children) { 1219 for (0 .. $#$children) {
881 my $child = $children->[$_]; 1220 my $child = $children->[$_];
882 my $h = $h[$_]; 1221 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w); 1222 $child->configure ($y, 0, $h, $w);
884 1223
885 $y += $h; 1224 $y += $h;
886 } 1225 }
1226
1227 1
887} 1228}
888 1229
889############################################################################# 1230#############################################################################
890 1231
891package CFClient::UI::VBox; 1232package CFClient::UI::VBox;
… …
904 (List::Util::sum map $_->[1], @alloc), 1245 (List::Util::sum map $_->[1], @alloc),
905 ) 1246 )
906} 1247}
907 1248
908sub size_allocate { 1249sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_; 1250 my ($self, $w, $h) = @_;
910 1251
911 $self->_size_allocate ($x, $y, $w, $h); 1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
912 1253
913 my $children = $self->{children}; 1254 my $children = $self->{children};
914 1255
915 my @h = map +($_->size_request)[1], @$children; 1256 my @h = map $_->{req_h}, @$children;
916 1257
917 my $req_h = List::Util::sum @h; 1258 my $req_h = List::Util::sum @h;
918 1259
919 if ($req_h > $h) { 1260 if ($req_h > $h) {
920 # ah well, not enough space 1261 # ah well, not enough space
… …
934 1275
935 my $y = 0; 1276 my $y = 0;
936 for (0 .. $#$children) { 1277 for (0 .. $#$children) {
937 my $child = $children->[$_]; 1278 my $child = $children->[$_];
938 my $h = $h[$_]; 1279 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h); 1280 $child->configure (0, $y, $w, $h);
940 1281
941 $y += $h; 1282 $y += $h;
942 } 1283 }
1284
1285 1
943} 1286}
944 1287
945############################################################################# 1288#############################################################################
946 1289
947package CFClient::UI::Label; 1290package CFClient::UI::Label;
948 1291
949our @ISA = CFClient::UI::Base::; 1292our @ISA = CFClient::UI::DrawBG::;
950 1293
951use SDL::OpenGL; 1294use CFClient::OpenGL;
952 1295
953sub new { 1296sub new {
954 my ($class, %arg) = @_; 1297 my ($class, %arg) = @_;
955 1298
956 my $self = $class->SUPER::new ( 1299 my $self = $class->SUPER::new (
957 fg => [1, 1, 1], 1300 fg => [1, 1, 1],
958 fontsize => $::FONTSIZE, 1301 #bg => none
959 text => "", 1302 #active_bg => none
1303 #font => default_font
1304 #text => initial text
1305 #markup => initial narkup
1306 #max_w => maximum pixel width
1307 ellipsise => 3, # end
1308 layout => (new CFClient::Layout),
1309 fontsize => 1,
960 align => -1, 1310 align => -1,
961 valign => -1, 1311 valign => -1,
962 padding => 2, 1312 padding => 2,
963 layout => new CFClient::Layout, 1313 can_events => 0,
964 %arg 1314 %arg
965 ); 1315 );
966 1316
967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1317 if (exists $self->{template}) {
1318 my $layout = new CFClient::Layout;
1319 $layout->set_text (delete $self->{template});
1320 $self->{template} = $layout;
1321 }
968 1322
969 $self->set_text (delete $self->{text}) if exists $self->{text}; 1323 if (exists $self->{markup}) {
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1324 $self->set_markup (delete $self->{markup});
1325 } else {
1326 $self->set_text (delete $self->{text});
1327 }
971 1328
972 $self 1329 $self
973} 1330}
974 1331
975sub escape_text { 1332sub escape($) {
976 local $_ = $_[1]; 1333 local $_ = $_[0];
977 1334
978 s/&/&amp;/g; 1335 s/&/&amp;/g;
979 s/>/&gt;/g; 1336 s/>/&gt;/g;
980 s/</&lt;/g; 1337 s/</&lt;/g;
981 1338
982 $_[1] 1339 $_
1340}
1341
1342sub update {
1343 my ($self) = @_;
1344
1345 delete $self->{texture};
1346 $self->SUPER::update;
983} 1347}
984 1348
985sub set_text { 1349sub set_text {
986 my ($self, $text) = @_; 1350 my ($self, $text) = @_;
987 1351
1352 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text";
1354
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
988 $self->{layout}->set_text ($text); 1356 $self->{layout}->set_text ($text);
989 1357
990 delete $self->{texture};
991 $self->update; 1358 $self->update;
1359 $self->check_size;
992} 1360}
993 1361
994sub set_markup { 1362sub set_markup {
995 my ($self, $markup) = @_; 1363 my ($self, $markup) = @_;
996 1364
1365 return if $self->{text} eq "M$markup";
1366 $self->{text} = "M$markup";
1367
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
997 $self->{layout}->set_markup ($markup); 1371 $self->{layout}->set_markup ($markup);
998 1372
999 delete $self->{texture};
1000 $self->update; 1373 $self->update;
1374 $self->check_size;
1001} 1375}
1002 1376
1003sub size_request { 1377sub size_request {
1004 my ($self) = @_; 1378 my ($self) = @_;
1005 1379
1006 $self->{layout}->set_width; 1380 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1007 $self->{layout}->set_height ($self->{fontsize}); 1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1008 1385
1009 my ($w, $h) = $self->{layout}->size; 1386 my ($w, $h) = $self->{layout}->size;
1387
1388 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font};
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391
1392 my ($w2, $h2) = $self->{template}->size;
1393
1394 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2;
1396 }
1010 1397
1011 ( 1398 (
1012 $w + $self->{padding} * 2, 1399 $w + $self->{padding} * 2,
1013 $h + $self->{padding} * 2, 1400 $h + $self->{padding} * 2,
1014 ) 1401 )
1015} 1402}
1016 1403
1017sub size_allocate { 1404sub size_allocate {
1018 my ($self, $x, $y, $w, $h) = @_; 1405 my ($self, $w, $h) = @_;
1019
1020 $self->_size_allocate ($x, $y, $w, $h) or return;
1021 1406
1022 delete $self->{texture}; 1407 delete $self->{texture};
1023} 1408}
1024 1409
1025sub update { 1410sub set_fontsize {
1026 my ($self) = @_; 1411 my ($self, $fontsize) = @_;
1027 1412
1413 $self->{fontsize} = $fontsize;
1028 delete $self->{texture}; 1414 delete $self->{texture};
1415
1029 $self->SUPER::update; 1416 $self->update;
1417 $self->check_size;
1030} 1418}
1031 1419
1032sub _draw { 1420sub _draw {
1033 my ($self) = @_; 1421 my ($self) = @_;
1034 1422
1423 $self->SUPER::_draw; # draw background, if applicable
1424
1035 my $tex = $self->{texture} ||= do { 1425 my $tex = $self->{texture} ||= do {
1426 $self->{layout}->set_foreground (@{$self->{fg}});
1427 $self->{layout}->set_font ($self->{font}) if $self->{font};
1036 $self->{layout}->set_width ($self->{w}); 1428 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1429 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432
1038 new_from_layout CFClient::Texture $self->{layout} 1433 my $tex = new_from_layout CFClient::Texture $self->{layout};
1434
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1437 : ($self->{w} - $tex->{w}) * 0.5);
1438
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1441 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1039 }; 1444 };
1040 1445
1041 glEnable GL_BLEND;
1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1043 glEnable GL_TEXTURE_2D; 1446 glEnable GL_TEXTURE_2D;
1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1045 1448
1449 if ($tex->{format} == GL_ALPHA) {
1046 glColor @{$self->{fg}}; 1450 glColor @{$self->{fg}};
1047
1048 $self->{ox} = int (
1049 $self->{align} < 0 ? $self->{padding}
1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
1053
1054 $self->{oy} = int (
1055 $self->{valign} < 0 ? $self->{padding}
1056 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1057 : ($self->{h} - $tex->{h}) * 0.5
1058 );
1059
1060 $tex->draw_quad ($self->{ox}, $self->{oy}); 1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1452 } else {
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1454 }
1061 1455
1062 glDisable GL_TEXTURE_2D; 1456 glDisable GL_TEXTURE_2D;
1063 glDisable GL_BLEND;
1064} 1457}
1065 1458
1066############################################################################# 1459#############################################################################
1067 1460
1068package CFClient::UI::EntryBase; 1461package CFClient::UI::EntryBase;
1069 1462
1070our @ISA = CFClient::UI::Label::; 1463our @ISA = CFClient::UI::Label::;
1071 1464
1072use SDL; 1465use CFClient::OpenGL;
1073use SDL::OpenGL;
1074 1466
1075sub new { 1467sub new {
1076 my $class = shift; 1468 my $class = shift;
1077 1469
1078 $class->SUPER::new ( 1470 $class->SUPER::new (
1079 fg => [1, 1, 1], 1471 fg => [1, 1, 1],
1080 bg => [0, 0, 0, 0.2], 1472 bg => [0, 0, 0, 0.2],
1081 active_bg => [1, 1, 1, 0.5], 1473 active_bg => [1, 1, 1, 0.5],
1082 active_fg => [0, 0, 0], 1474 active_fg => [0, 0, 0],
1083 can_hover => 1, 1475 can_hover => 1,
1084 can_focus => 1, 1476 can_focus => 1,
1085 valign => 0, 1477 valign => 0,
1478 can_events => 1,
1086 @_ 1479 @_
1087 ) 1480 )
1088} 1481}
1089 1482
1090sub _set_text { 1483sub _set_text {
… …
1092 1485
1093 delete $self->{cur_h}; 1486 delete $self->{cur_h};
1094 1487
1095 return if $self->{text} eq $text; 1488 return if $self->{text} eq $text;
1096 1489
1490 delete $self->{texture};
1491
1097 $self->{last_activity} = $::NOW; 1492 $self->{last_activity} = $::NOW;
1098 $self->{text} = $text; 1493 $self->{text} = $text;
1099 1494
1100 $text =~ s/./*/g if $self->{hidden}; 1495 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text "); 1496 $self->{layout}->set_text ("$text ");
1102 1497
1103 $self->emit (changed => $self->{text}); 1498 $self->emit (changed => $self->{text});
1104}
1105
1106sub get_text {
1107 $_[0]{text}
1108}
1109
1110sub size_request {
1111 my ($self) = @_;
1112
1113 my ($w, $h) = $self->SUPER::size_request;
1114
1115 ($w + 1, $h) # add 1 for cursor
1116}
1117
1118sub size_allocate {
1119 my ($self, $x, $y, $w, $h) = @_;
1120
1121 $self->SUPER::size_allocate ($x, $y, $w, $h);
1122
1123 $self->_set_text ($self->{text});
1124} 1499}
1125 1500
1126sub set_text { 1501sub set_text {
1127 my ($self, $text) = @_; 1502 my ($self, $text) = @_;
1128 1503
1129 $self->{cursor} = length $text; 1504 $self->{cursor} = length $text;
1130 $self->_set_text ($text); 1505 $self->_set_text ($text);
1131 $self->update; 1506 $self->update;
1507 $self->check_size;
1508}
1509
1510sub get_text {
1511 $_[0]{text}
1512}
1513
1514sub size_request {
1515 my ($self) = @_;
1516
1517 my ($w, $h) = $self->SUPER::size_request;
1518
1519 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1132} 1526}
1133 1527
1134sub key_down { 1528sub key_down {
1135 my ($self, $ev) = @_; 1529 my ($self, $ev) = @_;
1136 1530
1137 my $mod = $ev->key_mod; 1531 my $mod = $ev->{mod};
1138 my $sym = $ev->key_sym; 1532 my $sym = $ev->{sym};
1139
1140 my $uni = $ev->key_unicode; 1533 my $uni = $ev->{unicode};
1141 1534
1142 my $text = $self->get_text; 1535 my $text = $self->get_text;
1143 1536
1144 if ($sym == SDLK_BACKSPACE) { 1537 if ($uni == 8) {
1145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1538 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1146 } elsif ($sym == SDLK_DELETE) { 1539 } elsif ($uni == 127) {
1147 substr $text, $self->{cursor}, 1, ""; 1540 substr $text, $self->{cursor}, 1, "";
1148 } elsif ($sym == SDLK_LEFT) { 1541 } elsif ($sym == CFClient::SDLK_LEFT) {
1149 --$self->{cursor} if $self->{cursor}; 1542 --$self->{cursor} if $self->{cursor};
1150 } elsif ($sym == SDLK_RIGHT) { 1543 } elsif ($sym == CFClient::SDLK_RIGHT) {
1151 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1544 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1152 } elsif ($sym == SDLK_HOME) { 1545 } elsif ($sym == CFClient::SDLK_HOME) {
1153 $self->{cursor} = 0; 1546 $self->{cursor} = 0;
1154 } elsif ($sym == SDLK_END) { 1547 } elsif ($sym == CFClient::SDLK_END) {
1155 $self->{cursor} = length $text; 1548 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) { 1549 } elsif ($uni == 27) {
1157 $self->emit ('escape'); 1550 $self->emit ('escape');
1158 } elsif ($uni) { 1551 } elsif ($uni) {
1159 substr $text, $self->{cursor}++, 0, chr $uni; 1552 substr $text, $self->{cursor}++, 0, chr $uni;
1160 } 1553 }
1161 1554
1162 $self->_set_text ($text); 1555 $self->_set_text ($text);
1163 $self->update; 1556 $self->update;
1557 $self->check_size;
1164} 1558}
1165 1559
1166sub focus_in { 1560sub focus_in {
1167 my ($self) = @_; 1561 my ($self) = @_;
1168 1562
… …
1236 1630
1237package CFClient::UI::Entry; 1631package CFClient::UI::Entry;
1238 1632
1239our @ISA = CFClient::UI::EntryBase::; 1633our @ISA = CFClient::UI::EntryBase::;
1240 1634
1241use SDL; 1635use CFClient::OpenGL;
1242use SDL::OpenGL;
1243 1636
1244sub key_down { 1637sub key_down {
1245 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1246 1639
1247 my $sym = $ev->key_sym; 1640 my $sym = $ev->{sym};
1248 1641
1249 if ($sym == SDLK_RETURN) { 1642 if ($sym == 13) {
1643 unshift @{$self->{history}},
1644 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = '';
1250 $self->emit (activate => $self->get_text); 1647 $self->emit (activate => $txt);
1251 $self->update; 1648 $self->update;
1649
1650 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text;
1653 }
1654 if (@{$self->{history} || []} > 0) {
1655 $self->{history_pointer}++;
1656 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1657 $self->{history_pointer} = @{$self->{history} || []} - 1;
1658 }
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 }
1661
1662 } elsif ($sym == CFClient::SDLK_DOWN) {
1663 $self->{history_pointer}--;
1664 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1665
1666 if ($self->{history_pointer} >= 0) {
1667 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1668 } else {
1669 $self->set_text ($self->{history_saveback});
1670 }
1252 1671
1253 } else { 1672 } else {
1254 $self->SUPER::key_down ($ev); 1673 $self->SUPER::key_down ($ev);
1255 } 1674 }
1256 1675
… …
1260 1679
1261package CFClient::UI::Button; 1680package CFClient::UI::Button;
1262 1681
1263our @ISA = CFClient::UI::Label::; 1682our @ISA = CFClient::UI::Label::;
1264 1683
1265use SDL; 1684use CFClient::OpenGL;
1266use SDL::OpenGL;
1267 1685
1268my @tex = 1686my @tex =
1269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1687 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1270 qw(b1_button_active.png); 1688 qw(b1_button_active.png);
1271 1689
1272sub new { 1690sub new {
1273 my $class = shift; 1691 my $class = shift;
1274 1692
1275 $class->SUPER::new ( 1693 $class->SUPER::new (
1276 padding => 4, 1694 padding => 4,
1695 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1],
1697 can_hover => 1,
1698 align => 0,
1699 valign => 0,
1700 can_events => 1,
1701 @_
1702 )
1703}
1704
1705sub button_up {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 if ($x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) {
1710 $self->emit ("activate");
1711 }
1712}
1713
1714sub _draw {
1715 my ($self) = @_;
1716
1717 local $self->{fg} = $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722
1723 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1;
1726
1727 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1728
1729 glDisable GL_TEXTURE_2D;
1730
1731 $self->SUPER::_draw;
1732}
1733
1734#############################################################################
1735
1736package CFClient::UI::CheckBox;
1737
1738our @ISA = CFClient::UI::DrawBG::;
1739
1740my @tex =
1741 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1742 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1743
1744use CFClient::OpenGL;
1745
1746sub new {
1747 my $class = shift;
1748
1749 $class->SUPER::new (
1750 padding => 2,
1277 fg => [1, 1, 1], 1751 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0],
1278 bg => [1, 1, 1, 0.2], 1753 bg => [0, 0, 0, 0.2],
1279 active_fg => [0, 0, 1], 1754 active_bg => [1, 1, 1, 0.5],
1755 state => 0,
1280 can_hover => 1, 1756 can_hover => 1,
1281 @_ 1757 @_
1282 ) 1758 )
1283} 1759}
1284 1760
1761sub size_request {
1762 my ($self) = @_;
1763
1764 ($self->{padding} * 2 + 6) x 2
1765}
1766
1285sub button_up { 1767sub button_down {
1286 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1287 1769
1288 if ($x >= 0 && $x < $self->{w} 1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1289 && $y >= 0 && $y < $self->{h}) { 1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1290 $self->emit ("activate"); 1772 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state});
1291 } 1774 }
1292} 1775}
1293 1776
1294sub _draw { 1777sub _draw {
1295 my ($self) = @_; 1778 my ($self) = @_;
1296 1779
1297 local $self->{fg} = $self->{fg}; 1780 $self->SUPER::_draw;
1298 1781
1299 if ($GRAB == $self) { 1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1300 $self->{fg} = $self->{active_fg}; 1783
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1785
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787
1788 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789
1790 glEnable GL_TEXTURE_2D;
1791 $tex->draw_quad_alpha (0, 0, $s, $s);
1792 glDisable GL_TEXTURE_2D;
1793}
1794
1795#############################################################################
1796
1797package CFClient::UI::Image;
1798
1799our @ISA = CFClient::UI::Base::;
1800
1801use CFClient::OpenGL;
1802use Carp qw/confess/;
1803
1804our %loaded_images;
1805
1806sub new {
1807 my $class = shift;
1808
1809 my $self = $class->SUPER::new (can_events => 0, @_);
1810
1811 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1812
1813 $loaded_images{$self->{image}} ||=
1814 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1815
1816 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1817
1818 Scalar::Util::weaken $loaded_images{$self->{image}};
1819
1820 $self->{aspect} = $tex->{w} / $tex->{h};
1821
1822 $self
1823}
1824
1825sub size_request {
1826 my ($self) = @_;
1827
1828 ($self->{tex}->{w}, $self->{tex}->{h})
1829}
1830
1831sub _draw {
1832 my ($self) = @_;
1833
1834 my $tex = $self->{tex};
1835
1836 my ($w, $h) = ($self->{w}, $self->{h});
1837
1838 if ($self->{rot90}) {
1839 glRotate 90, 0, 0, 1;
1840 glTranslate 0, -$self->{w}, 0;
1841
1842 ($w, $h) = ($h, $w);
1301 } 1843 }
1844
1845 glEnable GL_TEXTURE_2D;
1846 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1847
1848 $tex->draw_quad_alpha (0, 0, $w, $h);
1849
1850 glDisable GL_TEXTURE_2D;
1851}
1852
1853#############################################################################
1854
1855package CFClient::UI::VGauge;
1856
1857our @ISA = CFClient::UI::Base::;
1858
1859use List::Util qw(min max);
1860
1861use CFClient::OpenGL;
1862
1863my %tex = (
1864 food => [
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1866 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1867 ],
1868 grace => [
1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1870 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1871 ],
1872 hp => [
1873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1874 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1875 ],
1876 mana => [
1877 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1878 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1879 ],
1880);
1881
1882# eg. VGauge->new (gauge => 'food'), default gauge: food
1883sub new {
1884 my $class = shift;
1885
1886 my $self = $class->SUPER::new (
1887 type => 'food',
1888 @_
1889 );
1890
1891 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1892
1893 $self
1894}
1895
1896sub size_request {
1897 my ($self) = @_;
1898
1899 #my $tex = $tex{$self->{type}}[0];
1900 #@$tex{qw(w h)}
1901 (0, 0)
1902}
1903
1904sub set_max {
1905 my ($self, $max) = @_;
1906
1907 return if $self->{max_val} == $max;
1908
1909 $self->{max_val} = $max;
1910 $self->update;
1911}
1912
1913sub set_value {
1914 my ($self, $val, $max) = @_;
1915
1916 $self->set_max ($max)
1917 if defined $max;
1918
1919 return if $self->{val} == $val;
1920
1921 $self->{val} = $val;
1922 $self->update;
1923}
1924
1925sub _draw {
1926 my ($self) = @_;
1927
1928 my $tex = $tex{$self->{type}};
1929 my ($t1, $t2, $t3) = @$tex;
1930
1931 my ($w, $h) = ($self->{w}, $self->{h});
1932
1933 if ($self->{vertical}) {
1934 glRotate 90, 0, 0, 1;
1935 glTranslate 0, -$self->{w}, 0;
1936
1937 ($w, $h) = ($h, $w);
1938 }
1939
1940 my $ycut = $self->{val} / ($self->{max_val} || 1);
1941
1942 my $ycut1 = max 0, min 1, $ycut;
1943 my $ycut2 = max 0, min 1, $ycut - 1;
1944
1945 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2);
1302 1947
1303 glEnable GL_BLEND; 1948 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glEnable GL_TEXTURE_2D; 1950 glEnable GL_TEXTURE_2D;
1306 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1307 glColor 0, 0, 0, 1;
1308 1952
1309 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1953 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS;
1955 glTexCoord 0 , 0; glVertex 0 , 0;
1956 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1957 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1958 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1959 glEnd;
1310 1960
1961 my $ycut1 = List::Util::min 1, $ycut;
1962 glBindTexture GL_TEXTURE_2D, $t2->{name};
1963 glBegin GL_QUADS;
1964 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1965 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1967 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1968 glEnd;
1969
1970 if ($t3) {
1971 glBindTexture GL_TEXTURE_2D, $t3->{name};
1972 glBegin GL_QUADS;
1973 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1974 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1975 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1976 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1977 glEnd;
1978 }
1979
1980 glDisable GL_BLEND;
1311 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1312 glDisable GL_BLEND;
1313
1314 $self->SUPER::_draw;
1315} 1982}
1316 1983
1317############################################################################# 1984#############################################################################
1318 1985
1319package CFClient::UI::CheckBox; 1986package CFClient::UI::Gauge;
1320 1987
1321our @ISA = CFClient::UI::DrawBG::; 1988our @ISA = CFClient::UI::VBox::;
1322
1323my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326
1327use SDL;
1328use SDL::OpenGL;
1329 1989
1330sub new { 1990sub new {
1331 my $class = shift; 1991 my ($class, %arg) = @_;
1332 1992
1333 $class->SUPER::new ( 1993 my $self = $class->SUPER::new (
1334 padding => 2, 1994 tooltip => $arg{type},
1335 fg => [1, 1, 1],
1336 active_fg => [1, 1, 0],
1337 state => 0,
1338 can_hover => 1, 1995 can_hover => 1,
1339 @_ 1996 can_events => 1,
1997 %arg,
1340 ) 1998 );
1341}
1342 1999
1343sub size_request { 2000 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2001 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2002 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
2003
2004 $self
2005}
2006
2007sub set_fontsize {
2008 my ($self, $fsize) = @_;
2009
2010 $self->{value}->set_fontsize ($fsize);
2011 $self->{max} ->set_fontsize ($fsize);
2012}
2013
2014sub set_max {
1344 my ($self) = @_; 2015 my ($self, $max) = @_;
1345 2016
1346 ($self->{padding} * 2 + 6) x 2 2017 $self->{gauge}->set_max ($max);
2018 $self->{max}->set_text ($max);
1347} 2019}
1348 2020
1349sub size_allocate { 2021sub set_value {
1350 my ($self, $x, $y, $w, $h) = @_;
1351
1352 $self->_size_allocate ($x, $y, $w, $h);
1353}
1354
1355sub button_down {
1356 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $val, $max) = @_;
1357 2023
1358 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2024 $self->set_max ($max)
1359 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2025 if defined $max;
1360 $self->{state} = !$self->{state};
1361 $self->emit (changed => $self->{state});
1362 }
1363}
1364 2026
1365sub _draw { 2027 $self->{gauge}->set_value ($val, $max);
1366 my ($self) = @_; 2028 $self->{value}->set_text ($val);
1367
1368 $self->SUPER::_draw;
1369
1370 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1371
1372 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1373
1374 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1375
1376 glEnable GL_BLEND;
1377 glEnable GL_TEXTURE_2D;
1378 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1379
1380 my $tex = $self->{state} ? $tex[1] : $tex[0];
1381
1382 $tex->draw_quad (0, 0, $s, $s);
1383
1384 glDisable GL_TEXTURE_2D;
1385 glDisable GL_BLEND;
1386} 2029}
1387 2030
1388############################################################################# 2031#############################################################################
1389 2032
1390package CFClient::UI::Slider; 2033package CFClient::UI::Slider;
1391 2034
1392use strict; 2035use strict;
1393 2036
1394use SDL::OpenGL; 2037use CFClient::OpenGL;
1395 2038
1396our @ISA = CFClient::UI::DrawBG::; 2039our @ISA = CFClient::UI::DrawBG::;
1397 2040
1398my @tex = 2041my @tex =
1399 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2042 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1400 qw(s1_slider.png s1_slider_bg.png); 2043 qw(s1_slider.png s1_slider_bg.png);
1401 2044
1402sub new { 2045sub new {
1403 my $class = shift; 2046 my $class = shift;
1404 2047
1405 # range [value, low, high, page] 2048 # range [value, low, high, page, unit]
1406 2049
1407 # TODO: 0-width page 2050 # TODO: 0-width page
1408 # TODO: req_w/h are wrong with vertical 2051 # TODO: req_w/h are wrong with vertical
1409 # TODO: calculations are off 2052 # TODO: calculations are off
1410 my $self = $class->SUPER::new ( 2053 my $self = $class->SUPER::new (
1411 fg => [1, 1, 1], 2054 fg => [1, 1, 1],
1412 active_fg => [0, 0, 0], 2055 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5],
1413 range => [0, 0, 100, 10], 2058 range => [0, 0, 100, 10],
1414 req_w => 40, 2059 req_w => $::WIDTH / 80,
1415 req_h => 13, 2060 req_h => $::WIDTH / 80,
1416 vertical => 0, 2061 vertical => 0,
1417 can_hover => 1, 2062 can_hover => 1,
1418 inner_pad => 5, 2063 inner_pad => 0.02,
1419 @_ 2064 @_
1420 ); 2065 );
1421 2066
2067 $self->set_value ($self->{range}[0]);
2068 $self->update;
2069
1422 $self 2070 $self
2071}
2072
2073sub set_value {
2074 my ($self, $value) = @_;
2075
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077
2078 $hi = $lo + 1 if $hi <= $lo;
2079
2080 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi;
2082
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit;
2085
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089
2090 if ($value != $old_value) {
2091 $self->emit (changed => $value);
2092 $self->update;
2093 }
1423} 2094}
1424 2095
1425sub size_request { 2096sub size_request {
1426 my ($self) = @_; 2097 my ($self) = @_;
1427 2098
… …
1440 2111
1441sub mouse_motion { 2112sub mouse_motion {
1442 my ($self, $ev, $x, $y) = @_; 2113 my ($self, $ev, $x, $y) = @_;
1443 2114
1444 if ($GRAB == $self) { 2115 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117
2118 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2121
2122 $self->set_value ($x * ($hi - $lo) + $lo);
2123 }
2124}
2125
2126sub update {
2127 my ($self) = @_;
2128
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]);
2131
1445 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2132 my ($value, $lo, $hi, $page) = @{$self->{range}};
1446 2133
1447 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2134 my $inner_w = 1 - 2 * $self->{inner_pad};
1448 2135
1449 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1450 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1451 2137
1452 $x -= $inner_pad_px; # substract the padding 2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1453 $x = $x * ($hi - $lo) / $inner_w + $lo; 2139 $value = $self->{scale} * ($value - $lo);
1454 $x = $lo if $x < $lo;
1455 $x = $hi - $page if $x > $hi - $page;
1456 $self->{range}[0] = $x;
1457 2140
1458 $self->emit (changed => $x); 2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
1459 $self->update; 2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value;
2147 $self->{knob_w} = $page;
1460 } 2148 });
1461}
1462 2149
1463# the inner_* stuff is for generating a padding for the slider handle, 2150 $self->SUPER::update;
1464# so that the handle doesn't leave the texture. This calculation isn't 100%
1465# correct propably, but it does the job for now
1466sub _calc_inner_pad_px {
1467 my ($self, $w) = @_;
1468 ($w / 100) * $self->{inner_pad} # % to pixels
1469} 2151}
1470 2152
1471sub _draw { 2153sub _draw {
1472 my ($self) = @_; 2154 my ($self) = @_;
1473 2155
1474 $self->SUPER::_draw (); 2156 $self->SUPER::_draw ();
1475 2157
1476 my ($w, $h) = @$self{qw(w h)}; 2158 glScale $self->{w}, $self->{h};
1477 2159
1478 if ($self->{vertical}) { 2160 if ($self->{vertical}) {
1479 # draw a vertical slider like a rotated horizontal slider 2161 # draw a vertical slider like a rotated horizontal slider
1480 2162
2163 glTranslate 1, 0, 0;
1481 glRotate 90, 0, 0, 1; 2164 glRotate 90, 0, 0, 1;
1482 glTranslate 0, -$self->{w}, 0;
1483
1484 ($w, $h) = ($h, $w);
1485 } 2165 }
1486 2166
1487 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2167 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1488 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2168 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1489 2169
1490 my ($value, $lo, $hi, $page) = @{$self->{range}};
1491
1492 $hi = $value + 1 if $lo == $hi;
1493
1494 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1495 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1496
1497 $page = int $page * $inner_w / ($hi - $lo);
1498 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1499
1500 $w -= $page;
1501 $page &= ~1;
1502 glTranslate $page * 0.5, 0, 0;
1503 $page ||= 2;
1504
1505 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1506 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1507
1508 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 2172
1513 # draw background 2173 # draw background
1514 $tex[1]->draw_quad (0, 0, $w, $h); 2174 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1515 2175
1516 # draw handle 2176 # draw handle
1517 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1518 2178
1519 glDisable GL_BLEND;
1520 glDisable GL_TEXTURE_2D; 2179 glDisable GL_TEXTURE_2D;
1521} 2180}
1522 2181
1523############################################################################# 2182#############################################################################
1524 2183
1525package CFClient::UI::TextView; 2184package CFClient::UI::TextView;
1526 2185
1527our @ISA = CFClient::UI::HBox::; 2186our @ISA = CFClient::UI::HBox::;
1528 2187
1529use SDL::OpenGL; 2188use CFClient::OpenGL;
1530 2189
1531sub new { 2190sub new {
1532 my $class = shift; 2191 my $class = shift;
1533 2192
1534 my $self = $class->SUPER::new ( 2193 my $self = $class->SUPER::new (
1535 req_w => $::WIDTH / 6, 2194 fontsize => 1,
1536 req_h => $::HEIGHT / 6, 2195 can_events => 0,
1537 fontsize => $::FONTSIZE, 2196 #font => default_font
1538 @_, 2197 @_,
1539 2198
1540 layout => (new CFClient::Layout), 2199 layout => (new CFClient::Layout 1),
1541 par => [], 2200 par => [],
1542 height => 0, 2201 height => 0,
1543 children => [ 2202 children => [
1544 (new CFClient::UI::Empty expand => 1), 2203 (new CFClient::UI::Empty expand => 1),
1545 (new CFClient::UI::Slider vertical => 1), 2204 (new CFClient::UI::Slider vertical => 1),
1546 ], 2205 ],
1547 ); 2206 );
1548 2207
1549 $self->{children}[1]->connect (changed => sub { 2208 $self->{children}[1]->connect (changed => sub { $self->update });
1550 $self->update;
1551 });
1552 2209
1553 $self 2210 $self
1554} 2211}
1555 2212
1556sub set_fontsize { 2213sub set_fontsize {
… …
1558 2215
1559 $self->{fontsize} = $fontsize; 2216 $self->{fontsize} = $fontsize;
1560 $self->reflow; 2217 $self->reflow;
1561} 2218}
1562 2219
2220sub size_allocate {
2221 my ($self, $w, $h) = @_;
2222
2223 $self->SUPER::size_allocate ($w, $h);
2224
2225 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w});
2228
2229 $self->reflow;
2230}
2231
1563sub text_height { 2232sub text_height {
1564 my ($self, $text) = @_; 2233 my ($self, $text, $indent) = @_;
1565 2234
1566 my $layout = $self->{layout}; 2235 my $layout = $self->{layout};
1567 2236
1568 $layout->set_height ($self->{fontsize}); 2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1569 $layout->set_width ($self->{w}); 2238 $layout->set_width ($self->{children}[0]{w} - $indent);
1570 $layout->set_text ($text); 2239 $layout->set_markup ($text);
1571 2240
1572 ($layout->size)[1] 2241 ($layout->size)[1]
1573} 2242}
1574 2243
1575sub reflow { 2244sub reflow {
… …
1577 2246
1578 $self->{need_reflow}++; 2247 $self->{need_reflow}++;
1579 $self->update; 2248 $self->update;
1580} 2249}
1581 2250
1582sub size_request {
1583 my ($self) = @_;
1584
1585 ($self->{req_w}, $self->{req_h})
1586}
1587
1588sub size_allocate {
1589 my ($self, $x, $y, $w, $h) = @_;
1590
1591 $self->SUPER::size_allocate ($x, $y, $w, $h);
1592
1593 $self->{layout}->set_height ($self->{fontsize});
1594 $self->{layout}->set_width ($self->{w});
1595
1596 $self->reflow;
1597}
1598
1599sub add_paragraph { 2251sub add_paragraph {
1600 my ($self, $color, $text) = @_; 2252 my ($self, $color, $text, $indent) = @_;
1601 2253
1602 #TODO: intelligently "reformat" paragraph 2254 #TODO: intelligently "reformat" paragraph
1603 2255
2256 for my $line (split /\n/, $text) {
1604 my $height = $self->text_height ($text); 2257 my $height = $self->text_height ($line);
1605
1606 $self->{height} += $height; 2258 $self->{height} += $height;
1607
1608 push @{$self->{par}}, [$height, $color, $text]; 2259 push @{$self->{par}}, [$height, $color, $indent, $line];
2260 }
1609 2261
1610 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1611 $self->{children}[1]->update; 2263 $self->{children}[1]->update;
1612} 2264}
1613 2265
… …
1618 2270
1619 return unless $self->{h} > 0; 2271 return unless $self->{h} > 0;
1620 2272
1621 delete $self->{texture}; 2273 delete $self->{texture};
1622 2274
1623 $ROOT->on_refresh ($self, sub { 2275 $ROOT->on_post_alloc ($self, sub {
1624 if (delete $self->{need_reflow}) { 2276 if (delete $self->{need_reflow}) {
1625 my $height = 0; 2277 my $height = 0;
1626 2278
1627 $height += $_->[0] = $self->text_height ($_->[2]) 2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
1628 for @{$self->{par}}; 2280 for @{$self->{par}};
1629 2281
1630 $self->{height} = $height; 2282 $self->{height} = $height;
1631 2283
1632 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2285 $self->{children}[1]->update;
1633 2286
1634 delete $self->{texture}; 2287 delete $self->{texture};
1635 } 2288 }
1636 2289
1637 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1638 glClearColor 0, 0, 0, 1; 2291 glClearColor 0.5, 0.5, 0.5, 0;
1639 glClear GL_COLOR_BUFFER_BIT; 2292 glClear GL_COLOR_BUFFER_BIT;
1640
1641 glEnable GL_BLEND;
1642 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1643 glEnable GL_TEXTURE_2D;
1644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645 2293
1646 my $top = int $self->{children}[1]{range}[0]; 2294 my $top = int $self->{children}[1]{range}[0];
1647 2295
1648 my $y0 = $top; 2296 my $y0 = $top;
1649 my $y1 = $top + $self->{h}; 2297 my $y1 = $top + $self->{h};
1650 2298
1651 my $y = 0; 2299 my $y = 0;
1652 2300
1653 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
1654 2302
2303 $layout->set_font ($self->{font}) if $self->{font};
2304
2305 glEnable GL_BLEND;
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307
1655 for my $par (@{$self->{par}}) { 2308 for my $par (@{$self->{par}}) {
1656 my $h = $par->[0]; 2309 my $h = $par->[0];
1657 2310
1658 if ($y0 < $y + $h && $y < $y1) { 2311 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] });
2313 $layout->set_width ($self->{w} - $par->[2]);
1659 $layout->set_text ($par->[2]); 2314 $layout->set_markup ($par->[3]);
1660 2315
1661 glColor @{ $par->[1] }; 2316 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1662 my ($W, $H) = $layout->size; 2317
1663 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2318 glRasterPos $par->[2], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1664 } 2320 }
1665 2321
1666 $y += $h; 2322 $y += $h;
1667 } 2323 }
1668 2324
1669 glDisable GL_TEXTURE_2D;
1670 glDisable GL_BLEND; 2325 glDisable GL_BLEND;
1671 }; 2326 };
1672 }); 2327 });
1673} 2328}
1674 2329
1675sub _draw { 2330sub _draw {
1676 my ($self) = @_; 2331 my ($self) = @_;
1677 2332
1678 if ($self->{texture}) {
1679 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1;
1681 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1682 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
1683 }
1684 2338
1685 $self->{children}[1]->draw; 2339 $self->{children}[1]->draw;
1686 2340
1687} 2341}
1688 2342
1689############################################################################# 2343#############################################################################
1690 2344
1691package CFClient::UI::MapWidget;
1692
1693use strict;
1694
1695use List::Util qw(min max);
1696
1697use SDL;
1698use SDL::OpenGL;
1699
1700our @ISA = CFClient::UI::Base::;
1701
1702sub new {
1703 my $class = shift;
1704
1705 $class->SUPER::new (
1706 z => -1,
1707 can_focus => 1,
1708 list => (glGenLists 1),
1709 @_
1710 )
1711}
1712
1713sub key_down {
1714 print "MAPKEYDOWN\n";
1715}
1716
1717sub key_up {
1718}
1719
1720sub button_down {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 $self->focus_in;
1724
1725 if ($ev->button == 2) {
1726 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729 $self->{motion} = sub {
1730 my ($ev, $x, $y) = @_;
1731
1732 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734 $::CFG->{map_shift_x} = $bw + $x - $ox;
1735 $::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737 $self->update;
1738 };
1739 }
1740}
1741
1742sub button_up {
1743 my ($self, $ev, $x, $y) = @_;
1744
1745 delete $self->{motion};
1746}
1747
1748sub mouse_motion {
1749 my ($self, $ev, $x, $y) = @_;
1750
1751 $self->{motion}->($ev, $x, $y) if $self->{motion};
1752}
1753
1754sub size_request {
1755 (
1756 1 + 32 * int $::WIDTH / 32,
1757 1 + 32 * int $::HEIGHT / 32,
1758 )
1759}
1760
1761sub update {
1762 my ($self) = @_;
1763
1764 $self->{need_update} = 1;
1765 $self->SUPER::update;
1766}
1767
1768sub draw {
1769 my ($self) = @_;
1770
1771 if (delete $self->{need_update}) {
1772 glNewList $self->{list}, GL_COMPILE;
1773
1774 if ($::MAP) {
1775 my $sw = int $::WIDTH / 32;
1776 my $sh = int $::HEIGHT / 32;
1777
1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1780
1781 glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1783 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1784
1785 if ($::CFG->{fow_enable}) {
1786 if ($::CFG->{fow_smooth}) { # smooth fog of war
1787 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1788 glConvolutionFilter2D
1789 GL_CONVOLUTION_2D,
1790 GL_ALPHA,
1791 3, 3,
1792 GL_ALPHA, GL_FLOAT,
1793 pack "f*",
1794 0.1, 0.1, 0.1,
1795 0.1, 0.2, 0.1,
1796 0.1, 0.1, 0.1,
1797 ;
1798 glEnable GL_CONVOLUTION_2D;
1799 }
1800
1801 $self->{fow_texture} = new CFClient::Texture
1802 w => $w,
1803 h => $h,
1804 data => $data,
1805 internalformat => GL_ALPHA,
1806 format => GL_ALPHA;
1807
1808 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1814
1815 glColor +($::CFG->{fow_intensity}) x 3, 1;
1816 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1817
1818 glDisable GL_TEXTURE_2D;
1819 glDisable GL_BLEND;
1820 }
1821
1822 # HACK BEGIN
1823 {
1824 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825 my ($w, $h) = (250, 250);
1826
1827 glEnable GL_BLEND;
1828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829 glEnable GL_TEXTURE_2D;
1830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832 $self->{mapmap_texture} =
1833 new CFClient::Texture
1834 w => $w,
1835 h => $h,
1836 data => $::MAP->mapmap ($w, $h),
1837 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839 $self->{mapmap_texture}->draw_quad (100, 100);
1840
1841 glDisable GL_TEXTURE_2D;
1842 glDisable GL_BLEND;
1843 }
1844 # HACK END
1845 }
1846
1847 glEndList;
1848 }
1849
1850 glPushMatrix;
1851 glCallList $self->{list};
1852 glPopMatrix;
1853
1854 if ($FOCUS != $self) {
1855 glColor 64/255, 64/255, 64/255;
1856 glLogicOp GL_AND;
1857 glEnable GL_COLOR_LOGIC_OP;
1858 glBegin GL_QUADS;
1859 glVertex 0, 0;
1860 glVertex 0, $::HEIGHT;
1861 glVertex $::WIDTH, $::HEIGHT;
1862 glVertex $::WIDTH, 0;
1863 glEnd;
1864 glDisable GL_COLOR_LOGIC_OP;
1865 }
1866}
1867
1868my %DIR = (
1869 SDLK_KP8, [1, "north"],
1870 SDLK_KP9, [2, "northeast"],
1871 SDLK_KP6, [3, "east"],
1872 SDLK_KP3, [4, "southeast"],
1873 SDLK_KP2, [5, "south"],
1874 SDLK_KP1, [6, "southwest"],
1875 SDLK_KP4, [7, "west"],
1876 SDLK_KP7, [8, "northwest"],
1877
1878 SDLK_UP, [1, "north"],
1879 SDLK_RIGHT, [3, "east"],
1880 SDLK_DOWN, [5, "south"],
1881 SDLK_LEFT, [7, "west"],
1882);
1883
1884sub key_down {
1885 my ($self, $ev) = @_;
1886
1887 my $mod = $ev->key_mod;
1888 my $sym = $ev->key_sym;
1889
1890 if ($sym == SDLK_KP5) {
1891 $::CONN->user_send ("stay fire");
1892 } elsif ($sym == SDLK_a) {
1893 $::CONN->user_send ("apply");
1894 } elsif ($sym == SDLK_QUOTE) {
1895 $self->emit ('activate_console');
1896 } elsif ($sym == SDLK_SLASH) {
1897 $self->emit ('activate_console' => '/');
1898 } elsif (exists $DIR{$sym}) {
1899 if ($mod & KMOD_SHIFT) {
1900 $self->{shft}++;
1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1902 } elsif ($mod & KMOD_CTRL) {
1903 $self->{ctrl}++;
1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1905 } else {
1906 $::CONN->user_send ("$DIR{$sym}[1]");
1907 }
1908 }
1909}
1910
1911sub key_up {
1912 my ($self, $ev) = @_;
1913
1914 my $mod = $ev->key_mod;
1915 my $sym = $ev->key_sym;
1916
1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1918 $::CONN->user_send ("fire_stop");
1919 }
1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1921 $::CONN->user_send ("run_stop");
1922 }
1923}
1924
1925#############################################################################
1926
1927package CFClient::UI::Animator; 2345package CFClient::UI::Animator;
1928 2346
1929use SDL::OpenGL; 2347use CFClient::OpenGL;
1930 2348
1931our @ISA = CFClient::UI::Bin::; 2349our @ISA = CFClient::UI::Bin::;
1932 2350
1933sub moveto { 2351sub moveto {
1934 my ($self, $x, $y) = @_; 2352 my ($self, $x, $y) = @_;
… …
1972 2390
1973sub new { 2391sub new {
1974 my $class = shift; 2392 my $class = shift;
1975 2393
1976 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
1977 state => 0, 2395 state => 0,
1978 connect_activate => \&toggle_flopper, 2396 connect_activate => \&toggle_flopper,
1979 @_ 2397 @_
1980 ); 2398 );
1981 2399
1982 if ($self->{state}) { 2400 if ($self->{state}) {
… …
2003 $self->emit (changed => $self->{state}); 2421 $self->emit (changed => $self->{state});
2004} 2422}
2005 2423
2006############################################################################# 2424#############################################################################
2007 2425
2426package CFClient::UI::Tooltip;
2427
2428our @ISA = CFClient::UI::Bin::;
2429
2430use CFClient::OpenGL;
2431
2432sub new {
2433 my $class = shift;
2434
2435 $class->SUPER::new (
2436 @_,
2437 can_events => 0,
2438 )
2439}
2440
2441sub set_tooltip_from {
2442 my ($self, $widget) = @_;
2443
2444 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip},
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8,
2448 fg => [0, 0, 0, 1],
2449 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP),
2451 );
2452}
2453
2454sub size_request {
2455 my ($self) = @_;
2456
2457 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2458
2459 ($w + 4, $h + 4)
2460}
2461
2462sub size_allocate {
2463 my ($self, $w, $h) = @_;
2464
2465 $self->SUPER::size_allocate ($w - 4, $h - 4);
2466}
2467
2468sub _draw {
2469 my ($self) = @_;
2470
2471 glTranslate 0.375, 0.375;
2472
2473 my ($w, $h) = @$self{qw(w h)};
2474
2475 glColor 1, 0.8, 0.4;
2476 glBegin GL_QUADS;
2477 glVertex 0 , 0;
2478 glVertex 0 , $h;
2479 glVertex $w, $h;
2480 glVertex $w, 0;
2481 glEnd;
2482
2483 glColor 0, 0, 0;
2484 glBegin GL_LINE_LOOP;
2485 glVertex 0 , 0;
2486 glVertex 0 , $h;
2487 glVertex $w, $h;
2488 glVertex $w, 0;
2489 glEnd;
2490
2491 glTranslate 2 - 0.375, 2 - 0.375;
2492 $self->SUPER::_draw;
2493}
2494
2495#############################################################################
2496
2497package CFClient::UI::Face;
2498
2499our @ISA = CFClient::UI::Base::;
2500
2501use CFClient::OpenGL;
2502
2503sub new {
2504 my $class = shift;
2505
2506 my $self = $class->SUPER::new (
2507 aspect => 1,
2508 @_,
2509 );
2510
2511 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self);
2513
2514 $self->{timer} = Event->timer (
2515 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2516 hard => 1,
2517 interval => $self->{animspeed},
2518 cb => sub {
2519 ++$widget->{frame};
2520 $widget->update;
2521 },
2522 );
2523 }
2524
2525 $self
2526}
2527
2528sub size_request {
2529 (32, 8)
2530}
2531
2532sub _draw {
2533 my ($self) = @_;
2534
2535 return unless $::CONN;#d# manage and cache textures differently
2536
2537 my $face;
2538
2539 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}];
2541
2542 $face = $anim->[ $self->{frame} % @$anim ]
2543 if $anim && @$anim;
2544 }
2545
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547
2548 if ($tex) {
2549 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D;
2554 }
2555}
2556
2557sub DESTROY {
2558 my ($self) = @_;
2559
2560 $self->{timer}->cancel
2561 if $self->{timer};
2562
2563 $self->SUPER::DESTROY;
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::InventoryItem;
2569
2570our @ISA = CFClient::UI::HBox::;
2571
2572sub _item_to_desc {
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719}
2720
2721#############################################################################
2722
2723package CFClient::UI::Menu;
2724
2725our @ISA = CFClient::UI::FancyFrame::;
2726
2727use CFClient::OpenGL;
2728
2729sub new {
2730 my $class = shift;
2731
2732 my $self = $class->SUPER::new (
2733 items => [],
2734 z => 100,
2735 @_,
2736 );
2737
2738 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2739
2740 for my $item (@{ $self->{items} }) {
2741 my ($widget, $cb) = @$item;
2742
2743 # handle various types of items, only text for now
2744 if (!ref $widget) {
2745 $widget = new CFClient::UI::Label
2746 can_hover => 1,
2747 can_events => 1,
2748 text => $widget;
2749 }
2750
2751 $self->{item}{$widget} = $item;
2752
2753 $self->{vbox}->add ($widget);
2754 }
2755
2756 $self
2757}
2758
2759# popup given the event (must be a mouse button down event currently)
2760sub popup {
2761 my ($self, $ev) = @_;
2762
2763 $self->emit ("popdown");
2764
2765 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self;
2767 $self->{button} = $ev->{button};
2768
2769 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771}
2772
2773sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_;
2775
2776 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER};
2779}
2780
2781sub button_up {
2782 my ($self, $ev, $x, $y) = @_;
2783
2784 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB;
2786 $self->hide;
2787
2788 $self->emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover};
2790 }
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Statusbox;
2796
2797our @ISA = CFClient::UI::VBox::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 $class->SUPER::new (
2803 fontsize => 0.8,
2804 @_,
2805 )
2806}
2807
2808sub reorder {
2809 my ($self) = @_;
2810 my $NOW = time;
2811
2812 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 }
2815
2816 my @widgets;
2817
2818 my @items = sort {
2819 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} };
2822
2823 my $count = 10 + 1;
2824 for my $item (@items) {
2825 last unless --$count;
2826
2827 push @widgets, $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text};
2832
2833 for ($short) {
2834 s/^\s+//;
2835 s/\s+/ /g;
2836 }
2837
2838 new CFClient::UI::Label
2839 markup => $short,
2840 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg},
2846 can_events => 1,
2847 can_hover => 1
2848 };
2849 }
2850
2851 $self->clear;
2852 $self->SUPER::add (reverse @widgets);
2853}
2854
2855sub add {
2856 my ($self, $text, %arg) = @_;
2857
2858 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//;
2860
2861 my $timeout = time + ((delete $arg{timeout}) || 60);
2862
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864
2865 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) {
2867 $item->{count}++;
2868 } else {
2869 $item->{count} = 1;
2870 $item->{text} = $item->{tooltip} = $text;
2871 }
2872 $item->{id} = ++$self->{id};
2873 $item->{timeout} = $timeout;
2874 delete $item->{label};
2875 } else {
2876 $self->{item}{$group} = {
2877 id => ++$self->{id},
2878 text => $text,
2879 timeout => $timeout,
2880 tooltip => $text,
2881 fg => [0.8, 0.8, 0.8, 0.8],
2882 pri => 0,
2883 count => 1,
2884 %arg,
2885 };
2886 }
2887
2888 $self->reorder;
2889}
2890
2891sub reconfigure {
2892 my ($self) = @_;
2893
2894 delete $_->{label}
2895 for values %{ $self->{item} || {} };
2896
2897 $self->reorder;
2898 $self->SUPER::reconfigure;
2899}
2900
2901#############################################################################
2902
2008package CFClient::UI::Root; 2903package CFClient::UI::Root;
2009 2904
2010our @ISA = CFClient::UI::Container::; 2905our @ISA = CFClient::UI::Container::;
2011 2906
2012use SDL::OpenGL; 2907use CFClient::OpenGL;
2908
2909sub new {
2910 my $class = shift;
2911
2912 $class->SUPER::new (
2913 @_,
2914 )
2915}
2916
2917sub configure {
2918 my ($self, $x, $y, $w, $h) = @_;
2919
2920 $self->{w} = $w;
2921 $self->{h} = $h;
2922}
2923
2924sub check_size {
2925 my ($self) = @_;
2926
2927 $self->size_allocate ($self->{w}, $self->{h})
2928 if $self->{w};
2929}
2013 2930
2014sub size_request { 2931sub size_request {
2015 ($::WIDTH, $::HEIGHT) 2932 my ($self) = @_;
2933
2934 ($self->{w}, $self->{h})
2016} 2935}
2017 2936
2018sub size_allocate { 2937sub size_allocate {
2019 my ($self, $x, $y, $w, $h) = @_; 2938 my ($self, $w, $h) = @_;
2020 2939
2021 $self->_size_allocate ($x, $y, $w, $h); 2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2022 2942
2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2024 for @{$self->{children}}; 2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2025}
2026 2945
2027sub _topleft { 2946 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2950 if exists $child->{req_x};
2951
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2953 if exists $child->{req_y};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957
2958 $child->configure ($X, $Y, $W, $H);
2959 }
2960}
2961
2962sub coord2local {
2028 my ($self, $x, $y) = @_; 2963 my ($self, $x, $y) = @_;
2029 2964
2030 ($x, $y) 2965 ($x, $y)
2031} 2966}
2032 2967
2968sub coord2global {
2969 my ($self, $x, $y) = @_;
2970
2971 ($x, $y)
2972}
2973
2033sub update { 2974sub update {
2034 my ($self) = @_; 2975 my ($self) = @_;
2035 2976
2036 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2977 $self->check_size;
2037 ::refresh (); 2978 $::WANT_REFRESH++;
2038} 2979}
2039 2980
2040sub add { 2981sub add {
2041 my ($self, $widget) = @_; 2982 my ($self, @children) = @_;
2042 2983
2984 for my $child (@children) {
2985 $child->{toplevel} = 1;
2986
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991
2043 $self->SUPER::add ($widget); 2992 $self->SUPER::add (@children);
2044
2045 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2046} 2993}
2047 2994
2048sub on_refresh { 2995sub on_refresh {
2049 my ($self, $id, $cb) = @_; 2996 my ($self, $id, $cb) = @_;
2050 2997
2051 $self->{refresh_hook}{$id} = $cb; 2998 $self->{refresh_hook}{$id} = $cb;
2052} 2999}
2053 3000
3001sub on_post_alloc {
3002 my ($self, $id, $cb) = @_;
3003
3004 $self->{post_alloc_hook}{$id} = $cb;
3005}
3006
2054sub draw { 3007sub draw {
2055 my ($self) = @_; 3008 my ($self) = @_;
2056 3009
2057 while (my $rcb = delete $self->{refresh_hook}) { 3010 while ($self->{refresh_hook}) {
2058 $_->() for values %$rcb; 3011 $_->()
3012 for values %{delete $self->{refresh_hook}};
3013 }
3014
3015 if ($self->{check_size}) {
3016 my @queue = ([], []);
3017
3018 for (;;) {
3019 if ($self->{check_size}) {
3020 # heuristic: check containers last
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3022 for values %{delete $self->{check_size}}
3023 }
3024
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3026
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3028 ? @$widget{qw(user_w user_h)}
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034
3035 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h;
3037
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3039
3040 $widget->{parent}->check_size
3041 if $widget->{parent};
3042 }
3043 }
3044 }
3045
3046 while ($self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) {
3048 my ($widget, $w, $h) = @$_;
3049
3050 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0;
3052
3053 $widget->{w} = $w;
3054 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h);
3056 $widget->emit (size_allocate => $w, $h);
3057 }
3058 }
3059
3060 while ($self->{post_alloc_hook}) {
3061 $_->()
3062 for values %{delete $self->{post_alloc_hook}};
2059 } 3063 }
2060 3064
2061 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3065 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2062 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2063 glClear GL_COLOR_BUFFER_BIT; 3067 glClear GL_COLOR_BUFFER_BIT;
2064 3068
2065 glMatrixMode GL_PROJECTION; 3069 glMatrixMode GL_PROJECTION;
2066 glLoadIdentity; 3070 glLoadIdentity;
2067 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2068 glMatrixMode GL_MODELVIEW; 3072 glMatrixMode GL_MODELVIEW;
2069 glLoadIdentity; 3073 glLoadIdentity;
2070 3074
2071 $self->_draw; 3075 $self->_draw;
2072} 3076}
… …
2074############################################################################# 3078#############################################################################
2075 3079
2076package CFClient::UI; 3080package CFClient::UI;
2077 3081
2078$ROOT = new CFClient::UI::Root; 3082$ROOT = new CFClient::UI::Root;
3083$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2079 3084
20801 30851
2081 3086

Diff Legend

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