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

Diff Legend

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