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

Diff Legend

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