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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 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
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
51 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
52} 70}
53 71
54# class methods for events 72# class methods for events
55sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 75 if $FOCUS;
58} 76}
59 77
60sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 80 if $FOCUS;
63} 81}
64 82
65sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
66 my ($ev) = @_; 84 my ($ev) = @_;
… …
75 check_tooltip; 93 check_tooltip;
76 } 94 }
77 95
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 97
80 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 100}
85 101
86sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
87 my ($ev) = @_; 103 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
89 105
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 107
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 109
94 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 112
99 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 115 $grab->update if $grab;
102 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 133
120 check_tooltip; 134 check_tooltip;
121 } 135 }
122 136
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 138 if $HOVER;
127} 139}
128 140
129# convert position array to integers 141# convert position array to integers
130sub harmonize { 142sub harmonize {
131 my ($vals) = @_; 143 my ($vals) = @_;
… …
137 $rem += $_ - $i; 149 $rem += $_ - $i;
138 $_ = $i; 150 $_ = $i;
139 } 151 }
140} 152}
141 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
142# call when resolution changes etc. 170# call when resolution changes etc.
143sub rescale_widgets { 171sub rescale_widgets {
144 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
145 173
146 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) { 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
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
156 } 189 }
157
158 $widget->reconfigure;
159 } 190 }
191
192 reconfigure_widgets;
160} 193}
161 194
162############################################################################# 195#############################################################################
163 196
164package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
169 202
170sub new { 203sub new {
171 my $class = shift; 204 my $class = shift;
172 205
173 my $self = bless { 206 my $self = bless {
174 x => 0, 207 x => "center",
175 y => 0, 208 y => "center",
176 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
177 can_events => 1, 212 can_events => 1,
178 @_ 213 @_
179 }, $class; 214 }, $class;
180 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
181 for (keys %$self) { 218 for (keys %$self) {
182 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
184 } 221 }
185 } 222 }
186 223
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 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 }
188 235
189 $self 236 $self
190} 237}
191 238
192sub destroy { 239sub destroy {
… …
202 return if $self->{parent}; 249 return if $self->{parent};
203 250
204 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
205} 252}
206 253
207sub hide { 254sub set_visible {
208 my ($self) = @_; 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};
209 278
210 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
212 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
213 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
214 if $self->{parent}; 313 if $self->{parent};
215} 314}
216 315
217sub move { 316sub move_abs {
218 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
219 318
220 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
221 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
222 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
223 322
224 $self->update; 323 $self->update;
225} 324}
226 325
227sub set_size { 326sub set_size {
228 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
229 328
230 $self->{user_w} = $w; 329 $self->{force_w} = $w;
231 $self->{user_h} = $h; 330 $self->{force_h} = $h;
232 331
233 $self->check_size; 332 $self->realloc;
234} 333}
235 334
236sub size_request { 335sub size_request {
237 require Carp; 336 require Carp;
238 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
240 339
241sub configure { 340sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
243 342
244 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
247 348
248 # use alignment to adjust x, y 349 # use alignment to adjust x, y
249 350
250 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 353 }
255 354
256 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 356 $self->{x} = $x;
258 $self->{y} = $y; 357 $self->{y} = $y;
259 $self->update; 358 $self->update;
260 } 359 }
261 360
262 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
264 } 368 }
265} 369}
266 370
267sub size_allocate { 371sub size_allocate {
268 # nothing to be done 372 # nothing to be done
269} 373}
270 374
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 375sub children {
279} 376}
280 377
281sub set_max_size { 378sub set_max_size {
282 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
283 380
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 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 }
286} 399}
287 400
288# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
289sub coord2local { 402sub coord2local {
290 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
305 return if $FOCUS == $self; 418 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
307 420
308 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
309 422
310 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
311 424
312 $focus->update if $focus; 425 $focus->update if $focus;
313 $FOCUS->update; 426 $FOCUS->update;
314} 427}
315 428
… …
318 431
319 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
320 433
321 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
322 435
323 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
324 437
325 $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;
326} 442}
327 443
328sub mouse_motion { } 444sub mouse_motion { }
329sub button_up { } 445sub button_up { }
330sub key_down { } 446sub key_down { }
331sub key_up { } 447sub key_up { }
332 448
333sub button_down { 449sub button_down {
334 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
335 451
336 $self->focus_in; 452 $self->focus_in;
… …
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
343sub 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}
344 530
345sub draw { 531sub draw {
346 my ($self) = @_; 532 my ($self) = @_;
347 533
348 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
365 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
366 glEnd; 552 glEnd;
367 glDisable GL_BLEND; 553 glDisable GL_BLEND;
368 } 554 }
369 555
370 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
371 glPushMatrix; 557 glPushMatrix;
372 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 561 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
377 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
378 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
379 glEnd; 565 glEnd;
380 glPopMatrix; 566 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 567 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 568 }
383} 569}
384 570
385sub _draw { 571sub _draw {
386 my ($self) = @_; 572 my ($self) = @_;
387 573
388 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
389}
390
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437} 575}
438 576
439sub DESTROY { 577sub DESTROY {
440 my ($self) = @_; 578 my ($self) = @_;
441 579
… …
456 my $class = shift; 594 my $class = shift;
457 595
458 # range [value, low, high, page] 596 # range [value, low, high, page]
459 597
460 $class->SUPER::new ( 598 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 599 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 600 #active_bg => [1, 1, 1, 0.5],
463 @_ 601 @_
464 ) 602 )
465} 603}
466 604
467sub _draw { 605sub _draw {
468 my ($self) = @_; 606 my ($self) = @_;
469 607
608 my $color = $FOCUS == $self && $self->{active_bg}
609 ? $self->{active_bg}
610 : $self->{bg};
611
612 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 613 my ($w, $h) = @$self{qw(w h)};
471 614
472 glEnable GL_BLEND; 615 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 617 glColor @$color;
475 618
476 glBegin GL_QUADS; 619 glBegin GL_QUADS;
477 glVertex 0 , 0; 620 glVertex 0 , 0;
478 glVertex 0 , $h; 621 glVertex 0 , $h;
479 glVertex $w, $h; 622 glVertex $w, $h;
480 glVertex $w, 0; 623 glVertex $w, 0;
481 glEnd; 624 glEnd;
482 625
483 glDisable GL_BLEND; 626 glDisable GL_BLEND;
627 }
484} 628}
485 629
486############################################################################# 630#############################################################################
487 631
488package CFClient::UI::Empty; 632package CFClient::UI::Empty;
… …
493 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
495} 639}
496 640
497sub size_request { 641sub size_request {
498 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
499} 645}
500 646
501sub draw { } 647sub draw { }
502 648
503############################################################################# 649#############################################################################
… …
532 $self->{children} = [ 678 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 680 @{$self->{children}}, @widgets
535 ]; 681 ];
536 682
537 $self->check_size (1); 683 $self->realloc;
538 $self->update;
539} 684}
540 685
541sub children { 686sub children {
542 @{ $_[0]{children} } 687 @{ $_[0]{children} }
543} 688}
… …
548 delete $child->{parent}; 693 delete $child->{parent};
549 $child->hide; 694 $child->hide;
550 695
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 697
553 $self->check_size; 698 $self->realloc;
554 $self->update;
555} 699}
556 700
557sub clear { 701sub clear {
558 my ($self) = @_; 702 my ($self) = @_;
559 703
… …
563 for (@$children) { 707 for (@$children) {
564 delete $_->{parent}; 708 delete $_->{parent};
565 $_->hide; 709 $_->hide;
566 } 710 }
567 711
568 $self->check_size; 712 $self->realloc;
569 $self->update;
570} 713}
571 714
572sub find_widget { 715sub find_widget {
573 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
574 717
… …
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 815 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 816 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 817 glClear GL_COLOR_BUFFER_BIT;
675 818
676 $self->_render; 819 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 820 };
685} 821}
686 822
687sub _draw { 823sub _draw {
688 my ($self) = @_; 824 my ($self) = @_;
… …
692 my $tex = $self->{texture} 828 my $tex = $self->{texture}
693 or return; 829 or return;
694 830
695 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 833 glColor 1, 1, 1, 1;
698 834
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 836
701 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
702} 838}
… …
705 841
706package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
707 843
708our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
709 845
846sub new {
847 my $class = shift;
848
849 $class->SUPER::new (
850 scroll_x => 0,
851 scroll_y => 1,
852 @_,
853 )
854}
855
710sub size_request { 856sub size_request {
711 my ($self) = @_; 857 my ($self) = @_;
712 858
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 860
716 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
717} 865}
718 866
719sub size_allocate { 867sub size_allocate {
720 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
721 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);
722 $self->update; 876 $self->update;
723} 877}
724 878
725sub set_offset { 879sub set_offset {
726 my ($self, $x, $y) = @_; 880 my ($self, $x, $y) = @_;
… …
777 my $class = shift; 931 my $class = shift;
778 932
779 my $self; 933 my $self;
780 934
781 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
782 vertical => 1, 936 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 938 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 939 $self->{vp}->set_offset (0, $_[1]);
786 }, 940 },
787 ; 941 ;
788 942
789 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 944 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 945 slider => $slider,
792 @_, 946 @_,
793 ); 947 );
794 948
795 $self->{vp}->add ($self->{scrolled}); 949 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp}); 950 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 951 $self->add ($self->{slider});
798 952
799 $self 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]);
800} 973}
801 974
802#TODO# update range on size_allocate depending on child 975#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 976# update viewport offset on scroll
804 977
… …
848 1021
849our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
850 1023
851use CFClient::OpenGL; 1024use CFClient::OpenGL;
852 1025
853my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1032 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856 1033
857sub new { 1034sub new {
858 my $class = shift; 1035 my $class = shift;
859 1036
860 # TODO: user_x, user_y, overwrite moveto?
861
862 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1040 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
868 @_ 1044 @_
869 ); 1045 );
870 1046
871 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
872 align => 0, 1048 align => 0,
… …
896 my ($self, $w, $h) = @_; 1072 my ($self, $w, $h) = @_;
897 1073
898 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
900 1076
901 $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)
902 if $self->{title}; 1078 if $self->{title};
903 1079
904 $self->child->configure ($self->border, $self->border, $w, $h); 1080 $self->child->configure ($self->border, $self->border, $w, $h);
905} 1081}
906 1082
… …
925 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
926 1102
927 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
929 1105
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size;
934 }; 1111 };
935 1112
936 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1117 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
942 1119
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
944 1121
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update;
947 }; 1123 };
948 } 1124 }
949} 1125}
950 1126
951sub button_up { 1127sub button_up {
… …
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1147
972 my $border = $self->border; 1148 my $border = $self->border;
973 1149
974 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1155
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
982 1158
983 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1162 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1164 }
994 1165
995 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
996 1167
… …
1012sub new { 1183sub new {
1013 my $class = shift; 1184 my $class = shift;
1014 1185
1015 $class->SUPER::new ( 1186 $class->SUPER::new (
1016 col_expand => [], 1187 col_expand => [],
1017 @_ 1188 @_,
1018 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1194}
1020 1195
1021sub add { 1196sub add {
1022 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1023 1198
1024 $child->set_parent ($self); 1199 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1026 1201
1027 $child->check_size; 1202 $self->realloc;
1028} 1203}
1029 1204
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# 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?
1035sub clear { 1206sub clear {
1036 my ($self) = @_; 1207 my ($self) = @_;
1037 1208
1038 my @children = $self->children; 1209 my @children = $self->children;
1039 delete $self->{children}; 1210 delete $self->{children};
… …
1041 for (@children) { 1212 for (@children) {
1042 delete $_->{parent}; 1213 delete $_->{parent};
1043 $_->hide; 1214 $_->hide;
1044 } 1215 }
1045 1216
1046 $self->update; 1217 $self->realloc;
1047} 1218}
1048 1219
1049sub get_wh { 1220sub get_wh {
1050 my ($self) = @_; 1221 my ($self) = @_;
1051 1222
… …
1082sub size_allocate { 1253sub size_allocate {
1083 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
1084 1255
1085 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1086 1257
1087 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
1089 1260
1090 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1318 }
1148} 1319}
1149 1320
1150############################################################################# 1321#############################################################################
1151 1322
1152package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1324
1156our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1157 1326
1158sub size_request { 1327sub size_request {
1159 my ($self) = @_; 1328 my ($self) = @_;
1160 1329
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1162 1331 ? (
1163 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1334 )
1166 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1167} 1339}
1168 1340
1169sub size_allocate { 1341sub size_allocate {
1170 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1171 1343
1172 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1345 my $children = $self->{children};
1175 1346
1176 my @h = map $_->{req_w}, @$children; 1347 my @req;
1177 1348
1178 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1179 1350 @req = ($space / (@$children || 1)) x @$children;
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } 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 {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 } 1365 }
1194 } 1366 }
1195 1367
1196 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1197 1369
1198 my $y = 0; 1370 my $pos = 0;
1199 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1374
1204 $y += $h; 1375 $pos += $alloc;
1205 } 1376 }
1206 1377
1207 1 1378 1
1208} 1379}
1209 1380
1210############################################################################# 1381#############################################################################
1211 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
1212package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1213 1399
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1217 1401
1218sub size_request { 1402sub new {
1219 my ($self) = @_; 1403 my $class = shift;
1220 1404
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1222 1406 vertical => 1,
1223 ( 1407 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1408 )
1227} 1409}
1228 1410
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1411#############################################################################
1269 1412
1270package CFClient::UI::Label; 1413package CFClient::UI::Label;
1271 1414
1272our @ISA = CFClient::UI::Base::; 1415our @ISA = CFClient::UI::DrawBG::;
1273 1416
1274use CFClient::OpenGL; 1417use CFClient::OpenGL;
1275 1418
1276sub new { 1419sub new {
1277 my ($class, %arg) = @_; 1420 my ($class, %arg) = @_;
1278 1421
1279 my $self = $class->SUPER::new ( 1422 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1423 fg => [1, 1, 1],
1424 #bg => none
1425 #active_bg => none
1281 #font => default_font 1426 #font => default_font
1282 #text => initial text 1427 #text => initial text
1283 #markup => initial narkup 1428 #markup => initial narkup
1429 #max_w => maximum pixel width
1430 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1285 fontsize => 1, 1432 fontsize => 1,
1286 align => -1, 1433 align => -1,
1287 valign => -1, 1434 valign => -1,
1288 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1289 can_events => 0, 1437 can_events => 0,
1290 %arg 1438 %arg
1291 ); 1439 );
1292 1440
1293 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1303 } 1451 }
1304 1452
1305 $self 1453 $self
1306} 1454}
1307 1455
1308sub escape { 1456sub escape($) {
1309 local $_ = $_[1]; 1457 local $_ = $_[0];
1310 1458
1311 s/&/&amp;/g; 1459 s/&/&amp;/g;
1312 s/>/&gt;/g; 1460 s/>/&gt;/g;
1313 s/</&lt;/g; 1461 s/</&lt;/g;
1314 1462
1315 $_[1] 1463 $_
1316} 1464}
1317 1465
1318sub update { 1466sub update {
1319 my ($self) = @_; 1467 my ($self) = @_;
1320 1468
… …
1329 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1330 1478
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1333 1481
1482 $self->realloc;
1334 $self->update; 1483 $self->update;
1335 $self->check_size;
1336} 1484}
1337 1485
1338sub set_markup { 1486sub set_markup {
1339 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1340 1488
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1493
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1348 1496
1497 $self->realloc;
1349 $self->update; 1498 $self->update;
1350 $self->check_size;
1351} 1499}
1352 1500
1353sub size_request { 1501sub size_request {
1354 my ($self) = @_; 1502 my ($self) = @_;
1355 1503
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 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});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1509
1360 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1361 1511
1362 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1367 1517
1368 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1370 } 1520 }
1371 1521
1372 ( 1522 ($w, $h)
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1523}
1377 1524
1378sub size_allocate { 1525sub size_allocate {
1379 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1380 1527
1381 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1530}
1383 1531
1384sub set_fontsize { 1532sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1386 1534
1387 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1536 delete $self->{texture};
1389 1537
1390 $self->update; 1538 $self->realloc;
1391 $self->check_size;
1392} 1539}
1393 1540
1394sub _draw { 1541sub _draw {
1395 my ($self) = @_; 1542 my ($self) = @_;
1543
1544 $self->SUPER::_draw; # draw background, if applicable
1396 1545
1397 my $tex = $self->{texture} ||= do { 1546 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1547 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1548 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $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});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1553
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1555
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1558 : ($self->{w} - $tex->{w}) * 0.5);
1408 1559
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1562 : ($self->{h} - $tex->{h}) * 0.5);
1412 1563
1413 $tex 1564 $tex
1414 }; 1565 };
1415 1566
1416 glEnable GL_TEXTURE_2D; 1567 glEnable GL_TEXTURE_2D;
… …
1444 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1445 can_hover => 1, 1596 can_hover => 1,
1446 can_focus => 1, 1597 can_focus => 1,
1447 valign => 0, 1598 valign => 0,
1448 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1449 @_ 1601 @_
1450 ) 1602 )
1451} 1603}
1452 1604
1453sub _set_text { 1605sub _set_text {
… …
1463 $self->{text} = $text; 1615 $self->{text} = $text;
1464 1616
1465 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1467 1619
1468 $self->emit (changed => $self->{text}); 1620 $self->_emit (changed => $self->{text});
1469} 1621}
1470 1622
1471sub set_text { 1623sub set_text {
1472 my ($self, $text) = @_; 1624 my ($self, $text) = @_;
1473 1625
1474 $self->{cursor} = length $text; 1626 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1627 $self->_set_text ($text);
1476 $self->check_size; 1628
1477 $self->update; 1629 $self->realloc;
1478} 1630}
1479 1631
1480sub get_text { 1632sub get_text {
1481 $_[0]{text} 1633 $_[0]{text}
1482} 1634}
… …
1485 my ($self) = @_; 1637 my ($self) = @_;
1486 1638
1487 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1488 1640
1489 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1642}
1497 1643
1498sub key_down { 1644sub key_down {
1499 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1500 1646
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1665 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1666 $self->_emit ('escape');
1521 } elsif ($uni) { 1667 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1669 }
1524 1670
1525 $self->_set_text ($text); 1671 $self->_set_text ($text);
1526 $self->update; 1672
1673 $self->realloc;
1527} 1674}
1528 1675
1529sub focus_in { 1676sub focus_in {
1530 my ($self) = @_; 1677 my ($self) = @_;
1531 1678
… …
1611 if ($sym == 13) { 1758 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1759 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1760 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1761 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1762 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1763 $self->_emit (activate => $txt);
1617 $self->update; 1764 $self->update;
1618 1765
1619 } elsif ($sym == CFClient::SDLK_UP) { 1766 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1767 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1768 $self->{history_saveback} = $self->get_text;
… …
1658 1805
1659sub new { 1806sub new {
1660 my $class = shift; 1807 my $class = shift;
1661 1808
1662 $class->SUPER::new ( 1809 $class->SUPER::new (
1663 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1664 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1667 can_hover => 1, 1814 can_hover => 1,
1668 align => 0, 1815 align => 0,
1669 valign => 0, 1816 valign => 0,
1670 can_events => 1, 1817 can_events => 1,
1671 @_ 1818 @_
1672 ) 1819 )
1673} 1820}
1674 1821
1822sub activate { }
1823
1675sub button_up { 1824sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1677 1826
1827 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1830}
1683 1831
1684sub _draw { 1832sub _draw {
1685 my ($self) = @_; 1833 my ($self) = @_;
1686 1834
… …
1715 1863
1716sub new { 1864sub new {
1717 my $class = shift; 1865 my $class = shift;
1718 1866
1719 $class->SUPER::new ( 1867 $class->SUPER::new (
1720 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1721 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1722 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],
1723 state => 0, 1874 state => 0,
1724 can_hover => 1, 1875 can_hover => 1,
1725 @_ 1876 @_
1726 ) 1877 )
1727} 1878}
1728 1879
1729sub size_request { 1880sub size_request {
1730 my ($self) = @_; 1881 my ($self) = @_;
1731 1882
1732 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1733} 1884}
1734 1885
1735sub button_down { 1886sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1737 1888
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1742 } 1893 }
1743} 1894}
1744 1895
1745sub _draw { 1896sub _draw {
1746 my ($self) = @_; 1897 my ($self) = @_;
1747 1898
1748 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1749 1900
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1902
1752 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;
1753 1906
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1908
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1910
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2164 qw(s1_slider.png s1_slider_bg.png);
2012 2165
2013sub new { 2166sub new {
2014 my $class = shift; 2167 my $class = shift;
2015 2168
2016 # range [value, low, high, page] 2169 # range [value, low, high, page, unit]
2017 2170
2018 # TODO: 0-width page 2171 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2172 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2173 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2023 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],
2024 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2027 vertical => 0, 2182 vertical => 0,
2028 can_hover => 1, 2183 can_hover => 1,
2029 inner_pad => 5, 2184 inner_pad => 0.02,
2030 @_ 2185 @_
2031 ); 2186 );
2032 2187
2188 $self->set_value ($self->{range}[0]);
2189 $self->update;
2190
2033 $self 2191 $self
2034} 2192}
2035 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
2036sub size_request { 2228sub size_request {
2037 my ($self) = @_; 2229 my ($self) = @_;
2038 2230
2039 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2232}
2044 2233
2045sub button_down { 2234sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2047 2236
2048 $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
2049 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2050} 2242}
2051 2243
2052sub mouse_motion { 2244sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2054 2246
2055 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
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2057 2266
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2268
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2271
2063 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2274
2069 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2276 $self->{knob_w} = $knob_w;
2071 } 2277 });
2072}
2073 2278
2074# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2280}
2081 2281
2082sub _draw { 2282sub _draw {
2083 my ($self) = @_; 2283 my ($self) = @_;
2084 2284
2085 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
2086 2286
2087 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
2088 2288
2089 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2091 2291
2292 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2294 }
2097 2295
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2298
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2301
2122 # draw background 2302 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2304
2125 # draw handle 2305 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2306 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2307
2128 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2129} 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 (@_) }
2130 2351
2131############################################################################# 2352#############################################################################
2132 2353
2133package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2134 2355
… …
2164 2385
2165 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2387 $self->reflow;
2167} 2388}
2168 2389
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2390sub size_allocate {
2189 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2190 2392
2191 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2192 2394
… …
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2398
2197 $self->reflow; 2399 $self->reflow;
2198} 2400}
2199 2401
2402sub text_size {
2403 my ($self, $text, $indent) = @_;
2404
2405 my $layout = $self->{layout};
2406
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent);
2409 $layout->set_markup ($text);
2410
2411 $layout->size
2412}
2413
2414sub reflow {
2415 my ($self) = @_;
2416
2417 $self->{need_reflow}++;
2418 $self->update;
2419}
2420
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 {
2429 my ($self) = @_;
2430
2431 $self->{par} = [];
2432 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434}
2435
2200sub add_paragraph { 2436sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2202 2438
2203 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2204 2440 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2208 2444
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $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]);
2212 $self->{children}[1]->update;
2213} 2446}
2214 2447
2215sub update { 2448sub update {
2216 my ($self) = @_; 2449 my ($self) = @_;
2217 2450
… …
2220 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2221 2454
2222 delete $self->{texture}; 2455 delete $self->{texture};
2223 2456
2224 $ROOT->on_post_alloc ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2225 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2461 my $height = 0;
2227 2462
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2229 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 }
2230 2478
2231 $self->{height} = $height; 2479 $self->{height} = $height;
2232 2480
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2482
2235 delete $self->{texture}; 2483 delete $self->{texture};
2236 } 2484 }
2237 2485
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2241 2489
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2490 my $top = int $self->{children}[1]{range}[0];
2246 2491
2247 my $y0 = $top; 2492 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2493 my $y1 = $top + $H;
2249 2494
2250 my $y = 0; 2495 my $y = 0;
2251 2496
2252 my $layout = $self->{layout}; 2497 my $layout = $self->{layout};
2253 2498
2254 $layout->set_font ($self->{font}) if $self->{font}; 2499 $layout->set_font ($self->{font}) if $self->{font};
2255 2500
2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2504
2256 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2506 my $h = $par->[1];
2258 2507
2259 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2262 2512
2263 my ($W, $H) = $layout->size; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2514
2515 glRasterPos $par->[3], $y - $y0;
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2517 }
2266 2518
2267 $y += $h; 2519 $y += $h;
2268 } 2520 }
2269 2521
2270 glDisable GL_TEXTURE_2D; 2522 glDisable GL_BLEND;
2271 }; 2523 };
2272 }); 2524 });
2273} 2525}
2274 2526
2275sub _draw { 2527sub _draw {
2276 my ($self) = @_; 2528 my ($self) = @_;
2277 2529
2278 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2283 2535
2284 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2285 2537
2286} 2538}
… …
2335 2587
2336sub new { 2588sub new {
2337 my $class = shift; 2589 my $class = shift;
2338 2590
2339 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2340 state => 0, 2592 state => 0,
2341 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2342 @_ 2594 @_
2343 ); 2595 );
2344 2596
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2597 $self
2351} 2598}
2352 2599
2353sub toggle_flopper { 2600sub toggle_flopper {
2354 my ($self) = @_; 2601 my ($self) = @_;
2355 2602
2356 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2604}
2368 2605
2369############################################################################# 2606#############################################################################
2370 2607
2371package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2384} 2621}
2385 2622
2386sub set_tooltip_from { 2623sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2388 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
2389 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2638 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2640 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2642 );
2396} 2643}
2397 2644
2398sub size_request { 2645sub size_request {
2399 my ($self) = @_; 2646 my ($self) = @_;
… …
2405 2652
2406sub size_allocate { 2653sub size_allocate {
2407 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2408 2655
2409 $self->SUPER::size_allocate ($w - 4, $h - 4); 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 });
2410} 2675}
2411 2676
2412sub _draw { 2677sub _draw {
2413 my ($self) = @_; 2678 my ($self) = @_;
2414 2679
… …
2431 glVertex $w, $h; 2696 glVertex $w, $h;
2432 glVertex $w, 0; 2697 glVertex $w, 0;
2433 glEnd; 2698 glEnd;
2434 2699
2435 glTranslate 2 - 0.375, 2 - 0.375; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2701
2436 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2437} 2703}
2438 2704
2439############################################################################# 2705#############################################################################
2440 2706
… …
2445use CFClient::OpenGL; 2711use CFClient::OpenGL;
2446 2712
2447sub new { 2713sub new {
2448 my $class = shift; 2714 my $class = shift;
2449 2715
2450 $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2451 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2452 @_, 2719 @_,
2453 ) 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
2454} 2737}
2455 2738
2456sub size_request { 2739sub size_request {
2457 (32, 8) 2740 (32, 8)
2458} 2741}
2459 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2460sub _draw { 2751sub _draw {
2461 my ($self) = @_; 2752 my ($self) = @_;
2462 2753
2463 return unless $::CONN;#d# manage and cache textures differently 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
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2766
2466 # TODO animation
2467 if ($tex) { 2767 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2768 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2770 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2473 } 2773 }
2474} 2774}
2475 2775
2476############################################################################# 2776sub DESTROY {
2477
2478package CFClient::UI::InventoryItem;
2479
2480our @ISA = CFClient::UI::HBox::;
2481
2482sub new {
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_; 2777 my ($self) = @_;
2561 2778
2562 $self->{scrolled}->clear; 2779 $self->{timer}->cancel
2563 return unless $items; 2780 if $self->{timer};
2564 2781
2565 my @items = sort { 2782 $self->SUPER::DESTROY;
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588} 2783}
2589 2784
2590############################################################################# 2785#############################################################################
2591 2786
2592package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
… …
2627 2822
2628# popup given the event (must be a mouse button down event currently) 2823# popup given the event (must be a mouse button down event currently)
2629sub popup { 2824sub popup {
2630 my ($self, $ev) = @_; 2825 my ($self, $ev) = @_;
2631 2826
2632 $self->emit ("popdown"); 2827 $self->_emit ("popdown");
2633 2828
2634 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2830 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2637 2832
2638 $self->show; 2833 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640} 2835}
2641 2836
2642sub mouse_motion { 2837sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2644 2839
… …
2652 2847
2653 if ($ev->{button} == $self->{button}) { 2848 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2849 undef $GRAB;
2655 $self->hide; 2850 $self->hide;
2656 2851
2657 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2853 $self->{hover}[1]->() if $self->{hover};
2659 } 2854 }
2660} 2855}
2661 2856
2662############################################################################# 2857#############################################################################
2663 2858
2664package CFClient::UI::Statusbox; 2859package CFClient::UI::Statusbox;
2665 2860
2666our @ISA = CFClient::UI::VBox::; 2861our @ISA = CFClient::UI::VBox::;
2862
2863sub new {
2864 my $class = shift;
2865
2866 $class->SUPER::new (
2867 fontsize => 0.8,
2868 @_,
2869 )
2870}
2667 2871
2668sub reorder { 2872sub reorder {
2669 my ($self) = @_; 2873 my ($self) = @_;
2670 my $NOW = time; 2874 my $NOW = time;
2671 2875
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2894 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2895 : $item->{text};
2692 2896
2693 for ($short) { 2897 for ($short) {
2694 s/^\s+//; 2898 s/^\s+//;
2695 s/\012.*/…/s; 2899 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2900 }
2699 2901
2700 new CFClient::UI::Label 2902 new CFClient::UI::Label
2701 markup => $short, 2903 markup => $short,
2702 tooltip => $item->{tooltip}, 2904 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2905 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2906 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2907 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2909 fg => $item->{fg},
2707 can_events => 1, 2910 can_events => 1,
2708 can_hover => 1 2911 can_hover => 1
2709 }; 2912 };
2710 } 2913 }
2711 2914
… …
2716sub add { 2919sub add {
2717 my ($self, $text, %arg) = @_; 2920 my ($self, $text, %arg) = @_;
2718 2921
2719 $text =~ s/^\s+//; 2922 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 2923 $text =~ s/\s+$//;
2924
2925 return unless $text;
2721 2926
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 2927 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 2928
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 2930
… …
2737 $self->{item}{$group} = { 2942 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2943 id => ++$self->{id},
2739 text => $text, 2944 text => $text,
2740 timeout => $timeout, 2945 timeout => $timeout,
2741 tooltip => $text, 2946 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2947 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2948 pri => 0,
2745 count => 1, 2949 count => 1,
2746 %arg, 2950 %arg,
2747 }; 2951 };
2748 } 2952 }
2749 2953
2750 $self->reorder; 2954 $self->reorder;
2751} 2955}
2752 2956
2957sub reconfigure {
2958 my ($self) = @_;
2959
2960 delete $_->{label}
2961 for values %{ $self->{item} || {} };
2962
2963 $self->reorder;
2964 $self->SUPER::reconfigure;
2965}
2966
2753############################################################################# 2967#############################################################################
2754 2968
2755package CFClient::UI::Root; 2969package CFClient::UI::Inventory;
2756 2970
2757our @ISA = CFClient::UI::Container::; 2971our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 2972
2761sub new { 2973sub new {
2762 my $class = shift; 2974 my $class = shift;
2763 2975
2764 $class->SUPER::new ( 2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_, 2978 @_,
2766 ) 2979 );
2767}
2768 2980
2769sub configure { 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 {
2770 my ($self, $x, $y, $w, $h) = @_; 3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2771 3130
2772 $self->{w} = $w; 3131 $self->clear_command_list;
2773 $self->{h} = $h; 3132 $self->{recording} = 0;
2774} 3133 $self->{rec_btn}->set_text ("start recording");
2775 3134
2776sub check_size { 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 {
2777 my ($self) = @_; 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}
2778 3153
2779 $self->size_allocate ($self->{w}, $self->{h}) 3154sub update_binding_widgets {
2780 if $self->{w}; 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
3260package CFClient::UI::Root;
3261
3262our @ISA = CFClient::UI::Container::;
3263
3264use CFClient::OpenGL;
3265
3266sub new {
3267 my $class = shift;
3268
3269 my $self = $class->SUPER::new (
3270 visible => 1,
3271 @_,
3272 );
3273
3274 Scalar::Util::weaken ($self->{root} = $self);
3275
3276 $self
2781} 3277}
2782 3278
2783sub size_request { 3279sub size_request {
2784 my ($self) = @_; 3280 my ($self) = @_;
2785 3281
2786 ($self->{w}, $self->{h}) 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
2787} 3297}
2788 3298
2789sub size_allocate { 3299sub size_allocate {
2790 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2791 3301
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 3302 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 3304
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3305 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3306 $Y = $child->{force_y} if exists $child->{force_y};
3307
3308 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h};
3310
2803 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
2804 } 3312 }
2805} 3313}
2806 3314
2807sub coord2local { 3315sub coord2local {
… …
2817} 3325}
2818 3326
2819sub update { 3327sub update {
2820 my ($self) = @_; 3328 my ($self) = @_;
2821 3329
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3330 $::WANT_REFRESH++;
2824} 3331}
2825 3332
2826sub add { 3333sub add {
2827 my ($self, @children) = @_; 3334 my ($self, @children) = @_;
2828 3335
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3336 $_->{is_toplevel} = 1
2831 3337 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3338
2837 $self->SUPER::add (@children); 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 }
2838} 3355}
2839 3356
2840sub on_refresh { 3357sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2842 3359
… …
2855 while ($self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2856 $_->() 3373 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
2858 } 3375 }
2859 3376
2860 if ($self->{check_size}) { 3377 if ($self->{realloc}) {
2861 my @queue = ([], []); 3378 my %queue;
3379 my @queue;
3380 my $widget;
2862 3381
2863 for (;;) { 3382 outer:
2864 if ($self->{check_size}) { 3383 while () {
2865 # heuristic: check containers last 3384 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3385 for $widget (values %$realloc) {
2867 for values %{delete $self->{check_size}} 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 }
2868 } 3392 }
2869 3393
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3394 while () {
3395 @queue or last outer;
2871 3396
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3397 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3398 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 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}) {
2880 $widget->{req_w} = $w; 3415 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3416 $widget->{req_h} = $h;
2882 3417
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3418 $self->{size_alloc}{$widget+0} = $widget;
2884 3419
2885 $widget->{parent}->check_size
2886 if $widget->{parent}; 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 }
2887 } 3427 }
3428
3429 delete $self->{realloc}{$widget+0};
2888 } 3430 }
2889 } 3431 }
2890 3432
2891 while ($self->{size_alloc}) { 3433 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 my ($widget, $w, $h) = @$_; 3435 values %$size_alloc;
3436
3437 while () {
3438 my $widget = pop @queue || last;
3439
3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2894 3441
2895 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
2897 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
2898 $widget->{w} = $w; 3452 $widget->{w} = $w;
2899 $widget->{h} = $h; 3453 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3454
2901 $widget->emit (size_allocate => $w, $h); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
2902 } 3457 }
2903 } 3458 }
2904 3459
2905 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
2906 $_->() 3461 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
2908 } 3463 }
2909 3464
3465
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
2913 3469
2914 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3471 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3474 glLoadIdentity;
2919 3475
2920 $self->_draw; 3476 $self->_draw;
2921} 3477}
… …
2923############################################################################# 3479#############################################################################
2924 3480
2925package CFClient::UI; 3481package CFClient::UI;
2926 3482
2927$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3485
29301 34861
2931 3487

Diff Legend

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