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.146 by elmex, Fri Apr 21 15:03:46 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->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
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;
92
93 check_tooltip;
33 } 94 }
34 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->{x}, $ev->{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) = @_;
… …
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;
… …
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,
210 w => undef,
211 h => undef,
212 can_events => 1,
101 @_ 213 @_
102 }, $class; 214 }, $class;
103 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
104 for (keys %$self) { 218 for (keys %$self) {
105 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
107 } 221 }
108 } 222 }
109 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
110 $self 236 $self
111} 237}
112 238
239sub destroy {
240 my ($self) = @_;
241
242 $self->hide;
243 %$self = ();
244}
245
113sub show { 246sub show {
114 my ($self) = @_; 247 my ($self) = @_;
115 248
116 return if $self->{parent}; 249 return if $self->{parent};
117 250
118 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
119} 252}
120 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
121sub hide { 307sub hide {
122 my ($self) = @_; 308 my ($self) = @_;
123 309
124 return unless $self->{parent}; 310 $self->set_invisible;
125 311
126 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
127} 314}
128 315
129sub move { 316sub move_abs {
130 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
131 318
132 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
133 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
134 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
135 322
136 $self->update; 323 $self->update;
137} 324}
138 325
139sub needs_redraw { 326sub set_size {
140 0 327 my ($self, $w, $h) = @_;
328
329 $self->{force_w} = $w;
330 $self->{force_h} = $h;
331
332 $self->realloc;
141} 333}
142 334
143sub size_request { 335sub size_request {
144 require Carp; 336 require Carp;
145 Carp::confess "size_request is abtract"; 337 Carp::confess "size_request is abstract";
146} 338}
147 339
148sub configure { 340sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
150 342
151 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
154 348
155 # use alignment to adjust x, y 349 # use alignment to adjust x, y
156 350
157 $x += ($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
158 $y += ($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
159
160 ($w, $h) = ($w2, $h2);
161 } 353 }
162 354
163 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
164 $self->{x} = $x; 356 $self->{x} = $x;
165 $self->{y} = $y; 357 $self->{y} = $y;
166 $self->update; 358 $self->update;
167 } 359 }
168 360
169 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
170 $self->{w} = $w; 364 $self->{alloc_w} = $w;
171 $self->{h} = $h; 365 $self->{alloc_h} = $h;
172 366
173 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
174 $self->update;
175 } 368 }
176} 369}
177 370
178sub size_allocate { 371sub size_allocate {
179 # nothing to be done 372 # nothing to be done
180} 373}
181 374
182# return top left coordinates 375sub children {
183sub _topleft { 376}
377
378sub set_max_size {
184 my ($self, $x, $y) = @_; 379 my ($self, $w, $h) = @_;
185 380
186 $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 }
187} 399}
188 400
189# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
190sub coord2local { 402sub coord2local {
191 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
192 404
193 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 406}
196 407
197# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
198sub coord2global { 409sub coord2global {
199 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
200 411
201 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 413}
204 414
205sub focus_in { 415sub focus_in {
206 my ($self) = @_; 416 my ($self) = @_;
207 417
208 return if $FOCUS == $self; 418 return if $FOCUS == $self;
209 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
210 420
211 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
212 422
213 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
214 424
215 $focus->update if $focus; 425 $focus->update if $focus;
216 $FOCUS->update; 426 $FOCUS->update;
217} 427}
218 428
… …
221 431
222 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
223 433
224 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
225 435
226 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
227 437
228 $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;
229} 442}
230 443
231sub mouse_motion { } 444sub mouse_motion { }
232sub button_up { } 445sub button_up { }
233sub key_down { } 446sub key_down { }
234sub key_up { } 447sub key_up { }
235 448
236sub button_down { 449sub button_down {
237 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
238 451
239 $self->focus_in; 452 $self->focus_in;
… …
242sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
243sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
244sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
245sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
246sub 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}
247 530
248sub draw { 531sub draw {
249 my ($self) = @_; 532 my ($self) = @_;
250 533
251 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 550 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
269 glEnd; 552 glEnd;
270 glDisable GL_BLEND; 553 glDisable GL_BLEND;
271 } 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 }
272} 569}
273 570
274sub _draw { 571sub _draw {
275 my ($self) = @_; 572 my ($self) = @_;
276 573
277 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
278} 575}
279 576
280sub find_widget {
281 my ($self, $x, $y) = @_;
282
283 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286
287 ()
288}
289
290sub set_parent {
291 my ($self, $parent) = @_;
292
293 Scalar::Util::weaken ($self->{parent} = $parent);
294}
295
296sub check_size {
297 my ($self) = @_;
298
299 my ($w, $h) = $self->size_request;
300
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308}
309
310sub update {
311 my ($self) = @_;
312
313 $self->{parent}->update
314 if $self->{parent};
315}
316
317sub connect {
318 my ($self, $signal, $cb) = @_;
319
320 push @{ $self->{signal_cb}{$signal} }, $cb;
321}
322
323sub emit {
324 my ($self, $signal, @args) = @_;
325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
327 $cb->($self, @args);
328 }
329}
330
331sub DESTROY { 577sub DESTROY {
332 my ($self) = @_; 578 my ($self) = @_;
333 579
580 delete $WIDGET{$self+0};
334 #$self->deactivate; 581 #$self->deactivate;
335} 582}
336 583
337############################################################################# 584#############################################################################
338 585
… …
347 my $class = shift; 594 my $class = shift;
348 595
349 # range [value, low, high, page] 596 # range [value, low, high, page]
350 597
351 $class->SUPER::new ( 598 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2], 599 #bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5], 600 #active_bg => [1, 1, 1, 0.5],
354 @_ 601 @_
355 ) 602 )
356} 603}
357 604
358sub _draw { 605sub _draw {
359 my ($self) = @_; 606 my ($self) = @_;
360 607
608 my $color = $FOCUS == $self && $self->{active_bg}
609 ? $self->{active_bg}
610 : $self->{bg};
611
612 if ($color && (@$color < 4 || $color->[3])) {
361 my ($w, $h) = @$self{qw(w h)}; 613 my ($w, $h) = @$self{qw(w h)};
362 614
363 glEnable GL_BLEND; 615 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 617 glColor @$color;
366 618
367 glBegin GL_QUADS; 619 glBegin GL_QUADS;
368 glVertex 0 , 0; 620 glVertex 0 , 0;
369 glVertex 0 , $h; 621 glVertex 0 , $h;
370 glVertex $w, $h; 622 glVertex $w, $h;
371 glVertex $w, 0; 623 glVertex $w, 0;
372 glEnd; 624 glEnd;
373 625
374 glDisable GL_BLEND; 626 glDisable GL_BLEND;
627 }
375} 628}
376 629
377############################################################################# 630#############################################################################
378 631
379package CFClient::UI::Empty; 632package CFClient::UI::Empty;
380
381our @ISA = CFClient::UI::Base::;
382
383sub size_request {
384 (0, 0)
385}
386
387sub draw { }
388
389#############################################################################
390
391package CFClient::UI::Container;
392 633
393our @ISA = CFClient::UI::Base::; 634our @ISA = CFClient::UI::Base::;
394 635
395sub new { 636sub new {
396 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) = @_;
397 657
398 my $children = delete $arg{children} || []; 658 my $children = delete $arg{children} || [];
399 659
400 my $self = $class->SUPER::new (children => [], %arg); 660 my $self = $class->SUPER::new (
661 children => [],
662 can_events => 0,
663 %arg,
664 );
401 $self->add ($_) for @$children; 665 $self->add ($_) for @$children;
402 666
403 $self 667 $self
404} 668}
405 669
406sub add { 670sub add {
407 my ($self, $child) = @_; 671 my ($self, @widgets) = @_;
408 672
409 $child->set_parent ($self); 673 $_->set_parent ($self)
674 for @widgets;
410 675
411 use sort 'stable'; 676 use sort 'stable';
412 677
413 $self->{children} = [ 678 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 680 @{$self->{children}}, @widgets
416 ]; 681 ];
417 682
418 $child->check_size; 683 $self->realloc;
684}
685
686sub children {
687 @{ $_[0]{children} }
419} 688}
420 689
421sub remove { 690sub remove {
422 my ($self, $child) = @_; 691 my ($self, $child) = @_;
423 692
424 delete $child->{parent}; 693 delete $child->{parent};
694 $child->hide;
425 695
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 697
428 $self->check_size; 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;
429} 713}
430 714
431sub find_widget { 715sub find_widget {
432 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
433 717
… …
508} 792}
509 793
510sub update { 794sub update {
511 my ($self) = @_; 795 my ($self) = @_;
512 796
513 # we want to do this delayed... 797 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 798 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 799}
527 800
528sub size_allocate { 801sub size_allocate {
529 my ($self, $w, $h) = @_; 802 my ($self, $w, $h) = @_;
530 803
531 $self->child->configure (0, 0, $w, $h); 804 $self->SUPER::size_allocate ($w, $h);
805 $self->update;
806}
532 807
808sub _render {
809 $_[0]{children}[0]->draw;
810}
811
812sub render_child {
813 my ($self) = @_;
814
815 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
816 glClearColor 0, 0, 0, 0;
817 glClear GL_COLOR_BUFFER_BIT;
818
533 $self->render_chld; 819 $self->_render;
820 };
534} 821}
535 822
536sub _draw { 823sub _draw {
537 my ($self) = @_; 824 my ($self) = @_;
538 825
539 my ($w, $h) = ($self->w, $self->h); 826 my ($w, $h) = ($self->w, $self->h);
540 827
541 my $tex = $self->{texture} 828 my $tex = $self->{texture}
542 or return; 829 or return;
543 830
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
547 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;
548 834
549 $tex->draw_quad (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 836
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
553} 838}
554 839
555############################################################################# 840#############################################################################
556 841
557package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
558 843
559our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 845
633sub new { 846sub new {
634 my $class = shift; 847 my $class = shift;
635 848
636 # TODO: user_x, user_y, overwrite moveto? 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;
637 1036
638 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
641 border => 0.8, 1040 border => 0.6,
1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
642 @_ 1044 @_
643 ); 1045 );
644 1046
645 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 1048 align => 0,
647 valign => 1, 1049 valign => 1,
648 text => $self->{title}, 1050 text => $self->{title},
649 fontsize => 1; 1051 fontsize => $self->{border};
650 1052
651 $self 1053 $self
652} 1054}
653 1055
654sub border { 1056sub border {
655 int $_[0]{border} * $::FONTSIZE 1057 int $_[0]{border} * $::FONTSIZE
656} 1058}
657 1059
658sub size_request { 1060sub size_request {
659 my ($self) = @_; 1061 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 1062
663 my ($w, $h) = $self->SUPER::size_request; 1063 my ($w, $h) = $self->SUPER::size_request;
664 1064
665 ( 1065 (
666 $w + $self->border * 2, 1066 $w + $self->border * 2,
… …
672 my ($self, $w, $h) = @_; 1072 my ($self, $w, $h) = @_;
673 1073
674 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
675 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
676 1076
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
678 if $self->{title}; 1078 if $self->{title};
679 1079
680 $self->child->configure ($self->border, $self->border, $w, $h); 1080 $self->child->configure ($self->border, $self->border, $w, $h);
681} 1081}
682 1082
683sub button_down { 1083sub button_down {
684 my ($self, $ev, $x, $y) = @_; 1084 my ($self, $ev, $x, $y) = @_;
685 1085
1086 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 1087 my $border = $self->border;
687 1088
688 if ($x < $self->{w} && $x >= $self->{w} - $border 1089 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 1090 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 1091
1092 if ($lr & $td) {
1093 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1094 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 1095 my ($bw, $bh) = ($self->{w}, $self->{h});
693 1096
1097 my $mx = $x < $border;
1098 my $my = $y < $border;
1099
694 $self->{motion} = sub { 1100 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
696 1102
697 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 my $dx = $ev->{x} - $ox;
1104 my $dy = $ev->{y} - $oy;
698 1105
699 $self->{user_w} = $bw + $x - $ox; 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
701 $self->check_size; 1108
1109 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
702 }; 1111 };
703 1112
704 } elsif ($x >= 0 && $x < $self->{w} 1113 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
709 1116
710 $self->{motion} = sub { 1117 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
712 1119
713 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
714 1121
715 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
716 $self->update;
717 }; 1123 };
718 } 1124 }
719} 1125}
720 1126
721sub button_up { 1127sub button_up {
… …
734 my ($self) = @_; 1140 my ($self) = @_;
735 1141
736 my ($w, $h ) = ($self->{w}, $self->{h}); 1142 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
738 1144
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 1145 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 1147
744 my $border = $self->border; 1148 my $border = $self->border;
745 1149
746 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
751 1155
752 my $bg = $tex[0]; 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1157 glColor @{ $self->{bg} };
753 1158
754 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1160 # solve this better(?)
756 my $rep_y = $ch / $bg->{h}; 1161 $bg->{s} = $cw / $bg->{w};
757 1162 $bg->{t} = $ch / $bg->{h};
758 glColor @{ $self->{bg} };
759
760 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 }
764 1165
765 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 1167
768 $self->{title}->draw if $self->{title}; 1168 $self->{title}->draw if $self->{title};
1169
769 $self->child->draw; 1170 $self->child->draw;
770} 1171}
771 1172
772############################################################################# 1173#############################################################################
773 1174
… …
782sub new { 1183sub new {
783 my $class = shift; 1184 my $class = shift;
784 1185
785 $class->SUPER::new ( 1186 $class->SUPER::new (
786 col_expand => [], 1187 col_expand => [],
787 @_ 1188 @_,
788 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
789} 1194}
790 1195
791sub add { 1196sub add {
792 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
793 1198
794 $child->set_parent ($self); 1199 $child->set_parent ($self);
795 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
796 1201
797 $child->check_size; 1202 $self->realloc;
798} 1203}
799 1204
800# 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?
801sub clear { 1206sub clear {
802 my ($self) = @_; 1207 my ($self) = @_;
803 1208
1209 my @children = $self->children;
804 delete $self->{children}; 1210 delete $self->{children};
805 $self->update; 1211
1212 for (@children) {
1213 delete $_->{parent};
1214 $_->hide;
1215 }
1216
1217 $self->realloc;
806} 1218}
807 1219
808sub get_wh { 1220sub get_wh {
809 my ($self) = @_; 1221 my ($self) = @_;
810 1222
… …
815 or next; 1227 or next;
816 1228
817 for my $x (0 .. $#$row) { 1229 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1230 my $widget = $row->[$x]
819 or next; 1231 or next;
820 my ($w, $h) = $widget->size_request; 1232 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1233
822 $w[$x] = max $w[$x], $w; 1234 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1235 $h[$y] = max $h[$y], $h;
824 } 1236 }
825 } 1237 }
… …
841sub size_allocate { 1253sub size_allocate {
842 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
843 1255
844 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
845 1257
846 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
847 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
848 1260
849 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
850 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
851 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
852 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
906 } 1318 }
907} 1319}
908 1320
909############################################################################# 1321#############################################################################
910 1322
911package CFClient::UI::HBox; 1323package CFClient::UI::Box;
912
913# TODO: wrap into common Box base class
914 1324
915our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
916 1326
917sub size_request { 1327sub size_request {
918 my ($self) = @_; 1328 my ($self) = @_;
919 1329
920 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
921 1331 ? (
922 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
923 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
924 (List::Util::max map $_->[1], @alloc), 1334 )
925 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
926} 1339}
927 1340
928sub size_allocate { 1341sub size_allocate {
929 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
930 1343
931 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
932
933 my $children = $self->{children}; 1345 my $children = $self->{children};
934 1346
935 my @h = map +($_->size_request)[0], @$children; 1347 my @req;
936 1348
937 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
938 1350 @req = ($space / (@$children || 1)) x @$children;
939 if ($req_h > $h) {
940 # ah well, not enough space
941 $_ *= $h / $req_h for @h;
942 } else { 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 {
943 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
944 $exp ||= 1;
945 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
946 for (0 .. $#$children) { 1364 for 0 .. $#$children;
947 my $child = $children->[$_];
948
949 my $alloc_h = $h[$_];
950 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
951 $h[$_] = $alloc_h;
952 } 1365 }
953 } 1366 }
954 1367
955 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
956 1369
957 my $y = 0; 1370 my $pos = 0;
958 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
959 my $child = $children->[$_];
960 my $h = $h[$_]; 1372 my $alloc = $req[$_];
961 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
962 1374
963 $y += $h; 1375 $pos += $alloc;
964 } 1376 }
965 1377
966 1 1378 1
967} 1379}
968 1380
969############################################################################# 1381#############################################################################
970 1382
1383package CFClient::UI::HBox;
1384
1385our @ISA = CFClient::UI::Box::;
1386
1387sub new {
1388 my $class = shift;
1389
1390 $class->SUPER::new (
1391 vertical => 0,
1392 @_,
1393 )
1394}
1395
1396#############################################################################
1397
971package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
972 1399
973# TODO: wrap into common Box base class
974
975our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
976 1401
977sub size_request { 1402sub new {
978 my ($self) = @_; 1403 my $class = shift;
979 1404
980 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
981 1406 vertical => 1,
982 ( 1407 @_,
983 (List::Util::max map $_->[0], @alloc),
984 (List::Util::sum map $_->[1], @alloc),
985 ) 1408 )
986} 1409}
987 1410
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 my $children = $self->{children};
992
993 my @h = map +($_->size_request)[1], @$children;
994
995 my $req_h = List::Util::sum @h;
996
997 if ($req_h > $h) {
998 # ah well, not enough space
999 $_ *= $h / $req_h for @h;
1000 } else {
1001 my $exp = List::Util::sum map $_->{expand}, @$children;
1002 $exp ||= 1;
1003
1004 for (0 .. $#$children) {
1005 my $child = $children->[$_];
1006
1007 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1008 }
1009 }
1010
1011 CFClient::UI::harmonize \@h;
1012
1013 my $y = 0;
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016 my $h = $h[$_];
1017 $child->configure (0, $y, $w, $h);
1018
1019 $y += $h;
1020 }
1021
1022 1
1023}
1024
1025############################################################################# 1411#############################################################################
1026 1412
1027package CFClient::UI::Label; 1413package CFClient::UI::Label;
1028 1414
1029our @ISA = CFClient::UI::Base::; 1415our @ISA = CFClient::UI::DrawBG::;
1030 1416
1031use CFClient::OpenGL; 1417use CFClient::OpenGL;
1032 1418
1033sub new { 1419sub new {
1034 my ($class, %arg) = @_; 1420 my ($class, %arg) = @_;
1035 1421
1036 my $self = $class->SUPER::new ( 1422 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1423 fg => [1, 1, 1],
1424 #bg => none
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),
1038 fontsize => 1, 1432 fontsize => 1,
1039 text => "",
1040 align => -1, 1433 align => -1,
1041 valign => -1, 1434 valign => -1,
1042 padding => 2, 1435 padding_x => 2,
1043 layout => new CFClient::Layout, 1436 padding_y => 2,
1437 can_events => 0,
1044 %arg 1438 %arg
1045 ); 1439 );
1046 1440
1047 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1444 $self->{template} = $layout;
1051 } 1445 }
1052 1446
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1054 $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 }
1055 1452
1056 $self 1453 $self
1057} 1454}
1058 1455
1059sub escape_text { 1456sub escape($) {
1060 local $_ = $_[1]; 1457 local $_ = $_[0];
1061 1458
1062 s/&/&amp;/g; 1459 s/&/&amp;/g;
1063 s/>/&gt;/g; 1460 s/>/&gt;/g;
1064 s/</&lt;/g; 1461 s/</&lt;/g;
1065 1462
1066 $_[1] 1463 $_
1464}
1465
1466sub update {
1467 my ($self) = @_;
1468
1469 delete $self->{texture};
1470 $self->SUPER::update;
1067} 1471}
1068 1472
1069sub set_text { 1473sub set_text {
1070 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1071 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;
1072 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1073 1481
1074 delete $self->{texture}; 1482 $self->realloc;
1075 $self->update; 1483 $self->update;
1076} 1484}
1077 1485
1078sub set_markup { 1486sub set_markup {
1079 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1080 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;
1081 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1082 1496
1083 delete $self->{texture}; 1497 $self->realloc;
1084 $self->update; 1498 $self->update;
1085} 1499}
1086 1500
1087sub size_request { 1501sub size_request {
1088 my ($self) = @_; 1502 my ($self) = @_;
1089 1503
1090 $self->{layout}->set_width; 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});
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1509
1093 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1094 1511
1095 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1515
1098 my ($w2, $h2) = $self->{template}->size; 1516 my ($w2, $h2) = $self->{template}->size;
1099 1517
1100 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1101 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1102 } 1520 }
1103 1521
1104 ( 1522 ($w, $h)
1105 $w + $self->{padding} * 2,
1106 $h + $self->{padding} * 2,
1107 )
1108} 1523}
1109 1524
1110sub size_allocate { 1525sub size_allocate {
1111 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1112 1527
1113 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1114} 1530}
1115 1531
1116sub set_fontsize { 1532sub set_fontsize {
1117 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1118 1534
1119 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1120 $self->update; 1536 delete $self->{texture};
1537
1538 $self->realloc;
1121} 1539}
1122 1540
1123sub _draw { 1541sub _draw {
1124 my ($self) = @_; 1542 my ($self) = @_;
1125 1543
1544 $self->SUPER::_draw; # draw background, if applicable
1545
1126 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};
1127 $self->{layout}->set_width ($self->{w}); 1549 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553
1129 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
1130 }; 1565 };
1131 1566
1132 glEnable GL_BLEND;
1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1134 glEnable GL_TEXTURE_2D; 1567 glEnable GL_TEXTURE_2D;
1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1136 1569
1570 if ($tex->{format} == GL_ALPHA) {
1137 glColor @{$self->{fg}}; 1571 glColor @{$self->{fg}};
1138
1139 $self->{ox} = int (
1140 $self->{align} < 0 ? $self->{padding}
1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
1144
1145 $self->{oy} = int (
1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $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 }
1152 1576
1153 glDisable GL_TEXTURE_2D; 1577 glDisable GL_TEXTURE_2D;
1154 glDisable GL_BLEND;
1155} 1578}
1156 1579
1157############################################################################# 1580#############################################################################
1158 1581
1159package CFClient::UI::EntryBase; 1582package CFClient::UI::EntryBase;
… …
1164 1587
1165sub new { 1588sub new {
1166 my $class = shift; 1589 my $class = shift;
1167 1590
1168 $class->SUPER::new ( 1591 $class->SUPER::new (
1169 fg => [1, 1, 1], 1592 fg => [1, 1, 1],
1170 bg => [0, 0, 0, 0.2], 1593 bg => [0, 0, 0, 0.2],
1171 active_bg => [1, 1, 1, 0.5], 1594 active_bg => [1, 1, 1, 0.5],
1172 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1173 can_hover => 1, 1596 can_hover => 1,
1174 can_focus => 1, 1597 can_focus => 1,
1175 valign => 0, 1598 valign => 0,
1599 can_events => 1,
1600 #text => ...
1176 @_ 1601 @_
1177 ) 1602 )
1178} 1603}
1179 1604
1180sub _set_text { 1605sub _set_text {
… …
1190 $self->{text} = $text; 1615 $self->{text} = $text;
1191 1616
1192 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1194 1619
1195 $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;
1196} 1630}
1197 1631
1198sub get_text { 1632sub get_text {
1199 $_[0]{text} 1633 $_[0]{text}
1200} 1634}
… …
1203 my ($self) = @_; 1637 my ($self) = @_;
1204 1638
1205 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1206 1640
1207 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1208}
1209
1210sub size_allocate {
1211 my ($self, $w, $h) = @_;
1212
1213 $self->_set_text ($self->{text});
1214}
1215
1216sub set_text {
1217 my ($self, $text) = @_;
1218
1219 $self->{cursor} = length $text;
1220 $self->_set_text ($text);
1221 $self->update;
1222} 1642}
1223 1643
1224sub key_down { 1644sub key_down {
1225 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1226 1646
… …
1228 my $sym = $ev->{sym}; 1648 my $sym = $ev->{sym};
1229 my $uni = $ev->{unicode}; 1649 my $uni = $ev->{unicode};
1230 1650
1231 my $text = $self->get_text; 1651 my $text = $self->get_text;
1232 1652
1233 if ($sym == 8) { 1653 if ($uni == 8) {
1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1235 } elsif ($sym == 127) { 1655 } elsif ($uni == 127) {
1236 substr $text, $self->{cursor}, 1, ""; 1656 substr $text, $self->{cursor}, 1, "";
1237 } elsif ($sym == CFClient::SDLK_LEFT) { 1657 } elsif ($sym == CFClient::SDLK_LEFT) {
1238 --$self->{cursor} if $self->{cursor}; 1658 --$self->{cursor} if $self->{cursor};
1239 } elsif ($sym == CFClient::SDLK_RIGHT) { 1659 } elsif ($sym == CFClient::SDLK_RIGHT) {
1240 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1660 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1241 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1242 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1243 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1244 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) { 1665 } elsif ($uni == 27) {
1246 $self->emit ('escape'); 1666 $self->_emit ('escape');
1247 } elsif ($uni) { 1667 } elsif ($uni) {
1248 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1249 } 1669 }
1250 1670
1251 $self->_set_text ($text); 1671 $self->_set_text ($text);
1252 $self->update; 1672
1673 $self->realloc;
1253} 1674}
1254 1675
1255sub focus_in { 1676sub focus_in {
1256 my ($self) = @_; 1677 my ($self) = @_;
1257 1678
… …
1333 my ($self, $ev) = @_; 1754 my ($self, $ev) = @_;
1334 1755
1335 my $sym = $ev->{sym}; 1756 my $sym = $ev->{sym};
1336 1757
1337 if ($sym == 13) { 1758 if ($sym == 13) {
1759 unshift @{$self->{history}},
1760 my $txt = $self->get_text;
1761 $self->{history_pointer} = -1;
1762 $self->{history_saveback} = '';
1338 $self->emit (activate => $self->get_text); 1763 $self->_emit (activate => $txt);
1339 $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 }
1340 1787
1341 } else { 1788 } else {
1342 $self->SUPER::key_down ($ev); 1789 $self->SUPER::key_down ($ev);
1343 } 1790 }
1344 1791
… …
1358 1805
1359sub new { 1806sub new {
1360 my $class = shift; 1807 my $class = shift;
1361 1808
1362 $class->SUPER::new ( 1809 $class->SUPER::new (
1363 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1364 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1365 bg => [1, 1, 1, 0.2],
1366 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1367 can_hover => 1, 1814 can_hover => 1,
1368 align => 0, 1815 align => 0,
1369 valign => 0, 1816 valign => 0,
1817 can_events => 1,
1370 @_ 1818 @_
1371 ) 1819 )
1372} 1820}
1373 1821
1822sub activate { }
1823
1374sub button_up { 1824sub button_up {
1375 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1376 1826
1827 $self->emit ("activate")
1377 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1378 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1379 $self->emit ("activate");
1380 }
1381} 1830}
1382 1831
1383sub _draw { 1832sub _draw {
1384 my ($self) = @_; 1833 my ($self) = @_;
1385 1834
… …
1387 1836
1388 if ($GRAB == $self) { 1837 if ($GRAB == $self) {
1389 $self->{fg} = $self->{active_fg}; 1838 $self->{fg} = $self->{active_fg};
1390 } 1839 }
1391 1840
1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D; 1841 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1; 1843 glColor 0, 0, 0, 1;
1397 1844
1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1399 1846
1400 glDisable GL_TEXTURE_2D; 1847 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402 1848
1403 $self->SUPER::_draw; 1849 $self->SUPER::_draw;
1404} 1850}
1405 1851
1406############################################################################# 1852#############################################################################
… …
1417 1863
1418sub new { 1864sub new {
1419 my $class = shift; 1865 my $class = shift;
1420 1866
1421 $class->SUPER::new ( 1867 $class->SUPER::new (
1422 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1423 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1424 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1872 bg => [0, 0, 0, 0.2],
1873 active_bg => [1, 1, 1, 0.5],
1425 state => 0, 1874 state => 0,
1426 can_hover => 1, 1875 can_hover => 1,
1427 @_ 1876 @_
1428 ) 1877 )
1429} 1878}
1430 1879
1431sub size_request { 1880sub size_request {
1432 my ($self) = @_; 1881 my ($self) = @_;
1433 1882
1434 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1435} 1884}
1436 1885
1437sub button_down { 1886sub button_down {
1438 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1439 1888
1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1442 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1443 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1444 } 1893 }
1445} 1894}
1446 1895
1447sub _draw { 1896sub _draw {
1448 my ($self) = @_; 1897 my ($self) = @_;
1449 1898
1450 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1451 1900
1452 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1453 1902
1454 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 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;
1455 1906
1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1457 1908
1458 glEnable GL_BLEND; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1910
1459 glEnable GL_TEXTURE_2D; 1911 glEnable GL_TEXTURE_2D;
1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1461
1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s); 1912 $tex->draw_quad_alpha (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D; 1913 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468} 1914}
1469 1915
1470############################################################################# 1916#############################################################################
1471 1917
1472package CFClient::UI::Image; 1918package CFClient::UI::Image;
… …
1479our %loaded_images; 1925our %loaded_images;
1480 1926
1481sub new { 1927sub new {
1482 my $class = shift; 1928 my $class = shift;
1483 1929
1484 my $self = $class->SUPER::new (@_); 1930 my $self = $class->SUPER::new (can_events => 0, @_);
1485 1931
1486 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1932 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1487 1933
1488 $loaded_images{$self->{image}} ||= 1934 $loaded_images{$self->{image}} ||=
1489 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1935 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1490 1936
1491 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 1937 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1938
1939 Scalar::Util::weaken $loaded_images{$self->{image}};
1492 1940
1493 $self->{aspect} = $tex->{w} / $tex->{h}; 1941 $self->{aspect} = $tex->{w} / $tex->{h};
1494 1942
1495 $self 1943 $self
1496} 1944}
… …
1513 glTranslate 0, -$self->{w}, 0; 1961 glTranslate 0, -$self->{w}, 0;
1514 1962
1515 ($w, $h) = ($h, $w); 1963 ($w, $h) = ($h, $w);
1516 } 1964 }
1517 1965
1518 glEnable GL_BLEND;
1519 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1520 glEnable GL_TEXTURE_2D; 1966 glEnable GL_TEXTURE_2D;
1521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 1968
1523 $tex->draw_quad (0, 0, $w, $h); 1969 $tex->draw_quad_alpha (0, 0, $w, $h);
1524 1970
1525 glDisable GL_BLEND;
1526 glDisable GL_TEXTURE_2D; 1971 glDisable GL_TEXTURE_2D;
1527} 1972}
1528 1973
1529############################################################################# 1974#############################################################################
1530 1975
1531package CFClient::UI::VGauge; 1976package CFClient::UI::VGauge;
1532 1977
1533our @ISA = CFClient::UI::Base::; 1978our @ISA = CFClient::UI::Base::;
1979
1980use List::Util qw(min max);
1534 1981
1535use CFClient::OpenGL; 1982use CFClient::OpenGL;
1536 1983
1537my %tex = ( 1984my %tex = (
1538 food => [ 1985 food => [
1539 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1540 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1987 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1541 ], 1988 ],
1542 grace => [ 1989 grace => [
1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1544 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1991 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1545 ], 1992 ],
1546 hp => [ 1993 hp => [
1547 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1994 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1548 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1995 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1549 ], 1996 ],
1550 mana => [ 1997 mana => [
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1998 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1552 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1999 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1553 ], 2000 ],
1554); 2001);
1555 2002
1556# eg. VGauge->new (gauge => 'food'), default gauge: food 2003# eg. VGauge->new (gauge => 'food'), default gauge: food
1557sub new { 2004sub new {
… …
1576} 2023}
1577 2024
1578sub set_max { 2025sub set_max {
1579 my ($self, $max) = @_; 2026 my ($self, $max) = @_;
1580 2027
2028 return if $self->{max_val} == $max;
2029
1581 $self->{max_val} = $max; 2030 $self->{max_val} = $max;
2031 $self->update;
1582} 2032}
1583 2033
1584sub set_value { 2034sub set_value {
1585 my ($self, $val, $max) = @_; 2035 my ($self, $val, $max) = @_;
1586 2036
1587 $self->set_max ($max) 2037 $self->set_max ($max)
1588 if defined $max; 2038 if defined $max;
1589 2039
1590 $max = $self->{max_val}; 2040 return if $self->{val} == $val;
2041
1591 $self->{val} = $val; 2042 $self->{val} = $val;
1592
1593 $self->update; 2043 $self->update;
1594} 2044}
1595 2045
1596sub _draw { 2046sub _draw {
1597 my ($self) = @_; 2047 my ($self) = @_;
1598 2048
1599 my $tex = $tex{$self->{type}}; 2049 my $tex = $tex{$self->{type}};
2050 my ($t1, $t2, $t3) = @$tex;
1600 2051
1601 my ($w, $h) = ($self->{w}, $self->{h}); 2052 my ($w, $h) = ($self->{w}, $self->{h});
1602 2053
1603 if ($self->{vertical}) { 2054 if ($self->{vertical}) {
1604 glRotate 90, 0, 0, 1; 2055 glRotate 90, 0, 0, 1;
… …
1606 2057
1607 ($w, $h) = ($h, $w); 2058 ($w, $h) = ($h, $w);
1608 } 2059 }
1609 2060
1610 my $ycut = $self->{val} / ($self->{max_val} || 1); 2061 my $ycut = $self->{val} / ($self->{max_val} || 1);
1611 $ycut = 1 if $self->{val} > $self->{max_val};
1612 2062
1613 my $t1 = $tex->[0]; 2063 my $ycut1 = max 0, min 1, $ycut;
1614 my $t2 = $tex->[1]; 2064 my $ycut2 = max 0, min 1, $ycut - 1;
2065
2066 my $h1 = $self->{h} * (1 - $ycut1);
2067 my $h2 = $self->{h} * (1 - $ycut2);
1615 2068
1616 glEnable GL_BLEND; 2069 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2070 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 2071 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2072 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 2073
1621 my $h1 = $self->{h} - $ycut * $self->{h};
1622 my $h2 = $ycut * $self->{h};
1623
1624 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2074 glBindTexture GL_TEXTURE_2D, $t1->{name};
1625 glBegin GL_QUADS; 2075 glBegin GL_QUADS;
1626 glTexCoord 0 , 0; glVertex 0 , 0; 2076 glTexCoord 0 , 0; glVertex 0 , 0;
1627 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2077 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1628 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2078 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1629 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2079 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1630 glEnd; 2080 glEnd;
1631 2081
2082 my $ycut1 = List::Util::min 1, $ycut;
1632 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2083 glBindTexture GL_TEXTURE_2D, $t2->{name};
1633 glBegin GL_QUADS; 2084 glBegin GL_QUADS;
1634 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2085 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1635 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2086 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1636 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2087 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1637 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2088 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1638 glEnd; 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 }
1639 2100
1640 glDisable GL_BLEND; 2101 glDisable GL_BLEND;
1641 glDisable GL_TEXTURE_2D; 2102 glDisable GL_TEXTURE_2D;
1642} 2103}
1643 2104
… …
1646package CFClient::UI::Gauge; 2107package CFClient::UI::Gauge;
1647 2108
1648our @ISA = CFClient::UI::VBox::; 2109our @ISA = CFClient::UI::VBox::;
1649 2110
1650sub new { 2111sub new {
1651 my ($class, %arg) = shift; 2112 my ($class, %arg) = @_;
1652 2113
1653 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
1654 @_, 2115 tooltip => $arg{type},
2116 can_hover => 1,
2117 can_events => 1,
2118 %arg,
1655 ); 2119 );
1656 2120
1657 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2121 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1658 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2122 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1659 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2123 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1660 2124
1661 $self 2125 $self
1662} 2126}
1663 2127
1664sub set_fontsize { 2128sub set_fontsize {
1665 my ($self, $fsize) = @_; 2129 my ($self, $fsize) = @_;
1666 2130
1667 $self->{value}->set_fontsize ($fsize); 2131 $self->{value}->set_fontsize ($fsize);
1668 $self->{max} ->set_fontsize ($fsize); 2132 $self->{max} ->set_fontsize ($fsize);
1669 $self->update; 2133}
2134
2135sub set_max {
2136 my ($self, $max) = @_;
2137
2138 $self->{gauge}->set_max ($max);
2139 $self->{max}->set_text ($max);
1670} 2140}
1671 2141
1672sub set_value { 2142sub set_value {
1673 my ($self, $val, $max) = @_; 2143 my ($self, $val, $max) = @_;
1674 2144
1675 $self->set_max ($max) 2145 $self->set_max ($max)
1676 if defined $max; 2146 if defined $max;
1677 2147
1678 $self->{gauge}->set_value ($val, $max); 2148 $self->{gauge}->set_value ($val, $max);
1679 $self->{value}->set_text ($val); 2149 $self->{value}->set_text ($val);
1680}
1681
1682sub set_max {
1683 my ($self, $max) = @_;
1684
1685 $self->{gauge}->set_max ($max);
1686 $self->{max}->set_text ($max);
1687} 2150}
1688 2151
1689############################################################################# 2152#############################################################################
1690 2153
1691package CFClient::UI::Slider; 2154package CFClient::UI::Slider;
… …
1701 qw(s1_slider.png s1_slider_bg.png); 2164 qw(s1_slider.png s1_slider_bg.png);
1702 2165
1703sub new { 2166sub new {
1704 my $class = shift; 2167 my $class = shift;
1705 2168
1706 # range [value, low, high, page] 2169 # range [value, low, high, page, unit]
1707 2170
1708 # TODO: 0-width page 2171 # TODO: 0-width page
1709 # TODO: req_w/h are wrong with vertical 2172 # TODO: req_w/h are wrong with vertical
1710 # TODO: calculations are off 2173 # TODO: calculations are off
1711 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
1712 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
1713 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],
1714 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
1715 req_w => 20, 2180 min_w => $::WIDTH / 80,
1716 req_h => 20, 2181 min_h => $::WIDTH / 80,
1717 vertical => 0, 2182 vertical => 0,
1718 can_hover => 1, 2183 can_hover => 1,
1719 inner_pad => 5, 2184 inner_pad => 0.02,
1720 @_ 2185 @_
1721 ); 2186 );
1722 2187
2188 $self->set_value ($self->{range}[0]);
2189 $self->update;
2190
1723 $self 2191 $self
1724} 2192}
1725 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
1726sub size_request { 2228sub size_request {
1727 my ($self) = @_; 2229 my ($self) = @_;
1728 2230
1729 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
1730 my $h = $self->{req_h};
1731
1732 $self->{vertical} ? ($h, $w) : ($w, $h)
1733} 2232}
1734 2233
1735sub button_down { 2234sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
1737 2236
1738 $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
1739 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
1740} 2242}
1741 2243
1742sub mouse_motion { 2244sub mouse_motion {
1743 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1744 2246
1745 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
1746 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
1747 2266
1748 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1749 2268
1750 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1751 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1752 2271
1753 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
1754 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
1755 $x = $lo if $x < $lo;
1756 $x = $hi - $page if $x > $hi - $page;
1757 $self->{range}[0] = $x;
1758 2274
1759 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
1760 $self->update; 2276 $self->{knob_w} = $knob_w;
1761 } 2277 });
1762}
1763 2278
1764# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
1765# so that the handle doesn't leave the texture. This calculation isn't 100%
1766# correct propably, but it does the job for now
1767sub _calc_inner_pad_px {
1768 my ($self, $w) = @_;
1769 ($w / 100) * $self->{inner_pad} # % to pixels
1770} 2280}
1771 2281
1772sub _draw { 2282sub _draw {
1773 my ($self) = @_; 2283 my ($self) = @_;
1774 2284
1775 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
1776 2286
1777 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
1778 2288
1779 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
1780 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
1781 2291
2292 glTranslate 1, 0, 0;
1782 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
1783 glTranslate 0, -$self->{w}, 0;
1784
1785 ($w, $h) = ($h, $w);
1786 } 2294 }
1787 2295
1788 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1789 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1790 2298
1791 my ($value, $lo, $hi, $page) = @{$self->{range}};
1792
1793 $hi = $value + 1 if $lo == $hi;
1794
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1797
1798 $page = int $page * $inner_w / ($hi - $lo);
1799 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1800
1801 $w -= $page;
1802 $page &= ~1;
1803 glTranslate $page * 0.5, 0, 0;
1804 $page ||= 2;
1805
1806 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1807 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1808
1809 glEnable GL_BLEND;
1810 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1811 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
1812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1813 2301
1814 # draw background 2302 # draw background
1815 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1816 2304
1817 # draw handle 2305 # draw handle
1818 $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);
1819 2307
1820 glDisable GL_BLEND;
1821 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
1822} 2309}
2310
2311#############################################################################
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 (@_) }
1823 2351
1824############################################################################# 2352#############################################################################
1825 2353
1826package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
1827 2355
… …
1831 2359
1832sub new { 2360sub new {
1833 my $class = shift; 2361 my $class = shift;
1834 2362
1835 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
1836 fontsize => 1, 2364 fontsize => 1,
2365 can_events => 0,
2366 #font => default_font
1837 @_, 2367 @_,
1838 2368
1839 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
1840 par => [], 2370 par => [],
1841 height => 0, 2371 height => 0,
1842 children => [ 2372 children => [
1843 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
1844 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
1845 ], 2375 ],
1846 ); 2376 );
1847 2377
1848 $self->{children}[1]->connect (changed => sub { 2378 $self->{children}[1]->connect (changed => sub { $self->update });
1849 $self->update;
1850 });
1851 2379
1852 $self 2380 $self
1853} 2381}
1854 2382
1855sub set_fontsize { 2383sub set_fontsize {
… …
1857 2385
1858 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
1859 $self->reflow; 2387 $self->reflow;
1860} 2388}
1861 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
1862sub text_height { 2402sub text_size {
1863 my ($self, $text) = @_; 2403 my ($self, $text, $indent) = @_;
1864 2404
1865 my $layout = $self->{layout}; 2405 my $layout = $self->{layout};
1866 2406
1867 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1868 $layout->set_width ($self->{w}); 2408 $layout->set_width ($self->{children}[0]{w} - $indent);
1869 $layout->set_text ($text); 2409 $layout->set_markup ($text);
1870 2410
1871 ($layout->size)[1] 2411 $layout->size
1872} 2412}
1873 2413
1874sub reflow { 2414sub reflow {
1875 my ($self) = @_; 2415 my ($self) = @_;
1876 2416
1877 $self->{need_reflow}++; 2417 $self->{need_reflow}++;
1878 $self->update; 2418 $self->update;
1879} 2419}
1880 2420
1881sub size_allocate { 2421sub set_offset {
2422 my ($self, $offset) = @_;
2423
2424 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset);
2426}
2427
2428sub clear {
1882 my ($self, $w, $h) = @_; 2429 my ($self) = @_;
1883 2430
1884 $self->SUPER::size_allocate ($w, $h); 2431 $self->{par} = [];
1885 2432 $self->{height} = 0;
1886 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1887 $self->{layout}->set_width ($self->{children}[0]{w});
1888
1889 $self->reflow;
1890} 2434}
1891 2435
1892sub add_paragraph { 2436sub add_paragraph {
1893 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
1894 2438
1895 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
1896 2440 my ($w, $h) = $self->text_size ($line);
1897 my $height = $self->text_height ($text);
1898
1899 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
1900 2444
1901 push @{$self->{par}}, [$height, $color, $text];
1902
1903 $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]);
1904 $self->{children}[1]->update;
1905} 2446}
1906 2447
1907sub update { 2448sub update {
1908 my ($self) = @_; 2449 my ($self) = @_;
1909 2450
… …
1911 2452
1912 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
1913 2454
1914 delete $self->{texture}; 2455 delete $self->{texture};
1915 2456
1916 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
1917 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
1918 my $height = 0; 2461 my $height = 0;
1919 2462
1920 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
1921 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 }
1922 2478
1923 $self->{height} = $height; 2479 $self->{height} = $height;
1924 2480
1925 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1926 2482
1927 delete $self->{texture}; 2483 delete $self->{texture};
1928 } 2484 }
1929 2485
1930 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1931 glClearColor 0, 0, 0, 1; 2487 glClearColor 0.5, 0.5, 0.5, 0;
1932 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
1933 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
1934 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
1935 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1936 glEnable GL_TEXTURE_2D;
1937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1938
1939 my $top = int $self->{children}[1]{range}[0];
1940
1941 my $y0 = $top;
1942 my $y1 = $top + $self->{h};
1943
1944 my $y = 0;
1945
1946 my $layout = $self->{layout};
1947 2504
1948 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
1949 my $h = $par->[0]; 2506 my $h = $par->[1];
1950 2507
1951 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]);
1952 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
1953 2512
1954 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1955 my ($W, $H) = $layout->size; 2514
1956 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;
1957 } 2517 }
1958 2518
1959 $y += $h; 2519 $y += $h;
1960 } 2520 }
1961 2521
1962 glDisable GL_TEXTURE_2D;
1963 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
1964 }; 2523 };
1965 }); 2524 });
1966} 2525}
1967 2526
1968sub _draw { 2527sub _draw {
1969 my ($self) = @_; 2528 my ($self) = @_;
1970 2529
1971 if ($self->{texture}) {
1972 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
1973 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;
1974 $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});
1975 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
1976 }
1977 2535
1978 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
1979 2537
1980} 2538}
1981 2539
… …
2029 2587
2030sub new { 2588sub new {
2031 my $class = shift; 2589 my $class = shift;
2032 2590
2033 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2034 state => 0, 2592 state => 0,
2035 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2036 @_ 2594 @_
2037 ); 2595 );
2038 2596
2039 if ($self->{state}) {
2040 $self->{state} = 0;
2041 $self->toggle_flopper;
2042 }
2043
2044 $self 2597 $self
2045} 2598}
2046 2599
2047sub toggle_flopper { 2600sub toggle_flopper {
2048 my ($self) = @_; 2601 my ($self) = @_;
2049 2602
2050 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2051 if ($self->{state} = !$self->{state}) { 2604}
2052 $CFClient::UI::ROOT->add ($self->{other}); 2605
2053 $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
2054 $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};
2055 } else { 2941 } else {
2056 $CFClient::UI::ROOT->remove ($self->{other}); 2942 $self->{item}{$group} = {
2057 $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 };
2058 } 2952 }
2059 2953
2060 $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;
2061} 2965}
2062 2966
2063############################################################################# 2967#############################################################################
2064 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
2065package CFClient::UI::Root; 3260package CFClient::UI::Root;
2066 3261
2067our @ISA = CFClient::UI::Container::; 3262our @ISA = CFClient::UI::Container::;
2068 3263
2069use CFClient::OpenGL; 3264use CFClient::OpenGL;
2070 3265
2071sub check_size { 3266sub new {
2072 my ($self) = @_; 3267 my $class = shift;
2073 3268
2074 $self->configure (0, 0, $::WITH, $::HEIGHT); 3269 my $self = $class->SUPER::new (
3270 visible => 1,
3271 @_,
3272 );
3273
3274 Scalar::Util::weaken ($self->{root} = $self);
3275
3276 $self
2075} 3277}
2076 3278
2077sub size_request { 3279sub size_request {
2078 ($::WIDTH, $::HEIGHT) 3280 my ($self) = @_;
2079}
2080 3281
2081sub configure { 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
3297}
3298
3299sub size_allocate {
2082 my ($self, $x, $y, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2083 3301
2084 $self->SUPER::configure ($x, $y, $w, $h); 3302 for my $child ($self->children) {
3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2085 3304
2086 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3305 $X = $child->{force_x} if exists $child->{force_x};
2087 for @{$self->{children}}; 3306 $Y = $child->{force_y} if exists $child->{force_y};
2088}
2089 3307
2090sub _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 {
2091 my ($self, $x, $y) = @_; 3316 my ($self, $x, $y) = @_;
2092 3317
2093 ($x, $y) 3318 ($x, $y)
2094} 3319}
2095 3320
3321sub coord2global {
3322 my ($self, $x, $y) = @_;
3323
3324 ($x, $y)
3325}
3326
2096sub update { 3327sub update {
2097 my ($self) = @_; 3328 my ($self) = @_;
2098 3329
2099 $self->check_size; 3330 $::WANT_REFRESH++;
2100 ::refresh ();
2101} 3331}
2102 3332
2103sub add { 3333sub add {
2104 my ($self, $child) = @_; 3334 my ($self, @children) = @_;
2105 3335
2106 # integerize window positions 3336 $_->{is_toplevel} = 1
2107 $child->{x} = int $child->{x}; 3337 for @children;
2108 $child->{y} = int $child->{y};
2109 3338
2110 $self->SUPER::add ($child); 3339 $self->SUPER::add (@children);
3340}
3341
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 }
2111} 3355}
2112 3356
2113sub on_refresh { 3357sub on_refresh {
2114 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2115 3359
2116 $self->{refresh_hook}{$id} = $cb; 3360 $self->{refresh_hook}{$id} = $cb;
2117} 3361}
2118 3362
3363sub on_post_alloc {
3364 my ($self, $id, $cb) = @_;
3365
3366 $self->{post_alloc_hook}{$id} = $cb;
3367}
3368
2119sub draw { 3369sub draw {
2120 my ($self) = @_; 3370 my ($self) = @_;
2121 3371
2122 while (my $rcb = delete $self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2123 $_->() for values %$rcb; 3373 $_->()
3374 for values %{delete $self->{refresh_hook}};
2124 } 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
2125 3465
2126 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2127 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2128 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
2129 3469
2130 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
2131 glLoadIdentity; 3471 glLoadIdentity;
2132 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2133 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
2134 glLoadIdentity; 3474 glLoadIdentity;
2135 3475
2136 $self->_draw; 3476 $self->_draw;
2137} 3477}
… …
2139############################################################################# 3479#############################################################################
2140 3480
2141package CFClient::UI; 3481package CFClient::UI;
2142 3482
2143$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2144 3485
21451 34861
2146 3487

Diff Legend

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