ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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