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.199 by root, Fri May 12 15:45:42 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
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 61 }
42 62
43 return; 63 return;
44 } 64 }
45 } 65 }
… …
49 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
50} 70}
51 71
52# class methods for events 72# class methods for events
53sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 75 if $FOCUS;
56} 76}
57 77
58sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 80 if $FOCUS;
61} 81}
62 82
63sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
64 my ($ev) = @_; 84 my ($ev) = @_;
… …
73 check_tooltip; 93 check_tooltip;
74 } 94 }
75 95
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 97
78 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 100}
83 101
84sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
85 my ($ev) = @_; 103 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
87 105
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 107
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 109
92 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 112
97 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 115 $grab->update if $grab;
100 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 133
118 check_tooltip; 134 check_tooltip;
119 } 135 }
120 136
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 138 if $HOVER;
125} 139}
126 140
127# convert position array to integers 141# convert position array to integers
128sub harmonize { 142sub harmonize {
129 my ($vals) = @_; 143 my ($vals) = @_;
… …
135 $rem += $_ - $i; 149 $rem += $_ - $i;
136 $_ = $i; 150 $_ = $i;
137 } 151 }
138} 152}
139 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
140############################################################################# 195#############################################################################
141 196
142package CFClient::UI::Base; 197package CFClient::UI::Base;
143 198
144use strict; 199use strict;
… …
147 202
148sub new { 203sub new {
149 my $class = shift; 204 my $class = shift;
150 205
151 my $self = bless { 206 my $self = bless {
152 x => 0, 207 x => "center",
153 y => 0, 208 y => "center",
154 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
155 can_events => 1, 212 can_events => 1,
156 @_ 213 @_
157 }, $class; 214 }, $class;
158 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
159 for (keys %$self) { 218 for (keys %$self) {
160 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
162 } 221 }
163 } 222 }
164 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
165 $self 236 $self
166} 237}
167 238
168sub destroy { 239sub destroy {
169 my ($self) = @_; 240 my ($self) = @_;
… …
178 return if $self->{parent}; 249 return if $self->{parent};
179 250
180 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
181} 252}
182 253
183sub hide { 254sub set_visible {
184 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};
185 278
186 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
188 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
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $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;
240 } 368 }
241} 369}
242 370
243sub size_allocate { 371sub size_allocate {
244 # nothing to be done 372 # nothing to be done
245} 373}
246 374
247sub children { 375sub children {
248} 376}
249 377
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size { 378sub set_max_size {
262 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
263 380
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 399}
267 400
268# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
269sub coord2local { 402sub coord2local {
270 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 418 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
287 420
288 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
289 422
290 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
291 424
292 $focus->update if $focus; 425 $focus->update if $focus;
293 $FOCUS->update; 426 $FOCUS->update;
294} 427}
295 428
… …
298 431
299 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
300 433
301 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
302 435
303 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
304 437
305 $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;
306} 442}
307 443
308sub mouse_motion { } 444sub mouse_motion { }
309sub button_up { } 445sub button_up { }
310sub key_down { } 446sub key_down { }
311sub key_up { } 447sub key_up { }
312 448
313sub button_down { 449sub button_down {
314 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
315 451
316 $self->focus_in; 452 $self->focus_in;
… …
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
323sub 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}
324 530
325sub draw { 531sub draw {
326 my ($self) = @_; 532 my ($self) = @_;
327 533
328 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
345 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
346 glEnd; 552 glEnd;
347 glDisable GL_BLEND; 553 glDisable GL_BLEND;
348 } 554 }
349 555
350 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
351 glPushMatrix; 557 glPushMatrix;
352 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 561 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
359 glEnd; 565 glEnd;
360 glPopMatrix; 566 glPopMatrix;
361 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;
362 } 568 }
363} 569}
364 570
365sub _draw { 571sub _draw {
366 my ($self) = @_; 572 my ($self) = @_;
367 573
368 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
369} 575}
370 576
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 577sub DESTROY {
420 my ($self) = @_; 578 my ($self) = @_;
421 579
580 delete $WIDGET{$self+0};
422 #$self->deactivate; 581 #$self->deactivate;
423} 582}
424 583
425############################################################################# 584#############################################################################
426 585
… …
435 my $class = shift; 594 my $class = shift;
436 595
437 # range [value, low, high, page] 596 # range [value, low, high, page]
438 597
439 $class->SUPER::new ( 598 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 599 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 600 #active_bg => [1, 1, 1, 0.5],
442 @_ 601 @_
443 ) 602 )
444} 603}
445 604
446sub _draw { 605sub _draw {
447 my ($self) = @_; 606 my ($self) = @_;
448 607
608 my $color = $FOCUS == $self && $self->{active_bg}
609 ? $self->{active_bg}
610 : $self->{bg};
611
612 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 613 my ($w, $h) = @$self{qw(w h)};
450 614
451 glEnable GL_BLEND; 615 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 617 glColor @$color;
454 618
455 glBegin GL_QUADS; 619 glBegin GL_QUADS;
456 glVertex 0 , 0; 620 glVertex 0 , 0;
457 glVertex 0 , $h; 621 glVertex 0 , $h;
458 glVertex $w, $h; 622 glVertex $w, $h;
459 glVertex $w, 0; 623 glVertex $w, 0;
460 glEnd; 624 glEnd;
461 625
462 glDisable GL_BLEND; 626 glDisable GL_BLEND;
627 }
463} 628}
464 629
465############################################################################# 630#############################################################################
466 631
467package CFClient::UI::Empty; 632package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
474} 639}
475 640
476sub size_request { 641sub size_request {
477 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
478} 645}
479 646
480sub draw { } 647sub draw { }
481 648
482############################################################################# 649#############################################################################
… …
511 $self->{children} = [ 678 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 680 @{$self->{children}}, @widgets
514 ]; 681 ];
515 682
516 $self->check_size (1); 683 $self->realloc;
517 $self->update;
518} 684}
519 685
520sub children { 686sub children {
521 @{ $_[0]{children} } 687 @{ $_[0]{children} }
522} 688}
… …
527 delete $child->{parent}; 693 delete $child->{parent};
528 $child->hide; 694 $child->hide;
529 695
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 697
532 $self->check_size; 698 $self->realloc;
533 $self->update;
534} 699}
535 700
536sub clear { 701sub clear {
537 my ($self) = @_; 702 my ($self) = @_;
538 703
… …
542 for (@$children) { 707 for (@$children) {
543 delete $_->{parent}; 708 delete $_->{parent};
544 $_->hide; 709 $_->hide;
545 } 710 }
546 711
547 $self->check_size; 712 $self->realloc;
548 $self->update;
549} 713}
550 714
551sub find_widget { 715sub find_widget {
552 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
553 717
… …
651 $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 {
652 glClearColor 0, 0, 0, 0; 816 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 817 glClear GL_COLOR_BUFFER_BIT;
654 818
655 $self->_render; 819 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 820 };
664} 821}
665 822
666sub _draw { 823sub _draw {
667 my ($self) = @_; 824 my ($self) = @_;
… …
671 my $tex = $self->{texture} 828 my $tex = $self->{texture}
672 or return; 829 or return;
673 830
674 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 833 glColor 1, 1, 1, 1;
677 834
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 836
680 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
681} 838}
… …
684 841
685package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
686 843
687our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
688 845
846sub new {
847 my $class = shift;
848
849 $class->SUPER::new (
850 scroll_x => 0,
851 scroll_y => 1,
852 @_,
853 )
854}
855
689sub size_request { 856sub size_request {
690 my ($self) = @_; 857 my ($self) = @_;
691 858
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 860
695 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
696} 865}
697 866
698sub size_allocate { 867sub size_allocate {
699 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 876 $self->update;
702} 877}
703 878
704sub set_offset { 879sub set_offset {
705 my ($self, $x, $y) = @_; 880 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 931 my $class = shift;
757 932
758 my $self; 933 my $self;
759 934
760 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
761 vertical => 1, 936 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 938 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 939 $self->{vp}->set_offset (0, $_[1]);
765 }, 940 },
766 ; 941 ;
767 942
768 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 944 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 945 slider => $slider,
771 @_, 946 @_,
772 ); 947 );
773 948
774 $self->{vp}->add ($self->{scrolled}); 949 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp}); 950 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 951 $self->add ($self->{slider});
777 952
778 $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]);
779} 973}
780 974
781#TODO# update range on size_allocate depending on child 975#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 976# update viewport offset on scroll
783 977
… …
827 1021
828our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
829 1023
830use CFClient::OpenGL; 1024use CFClient::OpenGL;
831 1025
832my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 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);
835 1033
836sub new { 1034sub new {
837 my $class = shift; 1035 my $class = shift;
838 1036
839 # TODO: user_x, user_y, overwrite moveto?
840
841 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1040 border => 0.6,
845 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
846 @_ 1044 @_
847 ); 1045 );
848 1046
849 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
850 align => 0, 1048 align => 0,
… …
874 my ($self, $w, $h) = @_; 1072 my ($self, $w, $h) = @_;
875 1073
876 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
878 1076
879 $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)
880 if $self->{title}; 1078 if $self->{title};
881 1079
882 $self->child->configure ($self->border, $self->border, $w, $h); 1080 $self->child->configure ($self->border, $self->border, $w, $h);
883} 1081}
884 1082
… …
903 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
904 1102
905 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
907 1105
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size;
912 }; 1111 };
913 1112
914 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1117 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
920 1119
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
922 1121
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update;
925 }; 1123 };
926 } 1124 }
927} 1125}
928 1126
929sub button_up { 1127sub button_up {
… …
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1147
950 my $border = $self->border; 1148 my $border = $self->border;
951 1149
952 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
957 1155
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
960 1158
961 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1162 $bg->{t} = $ch / $bg->{h};
964
965 glColor @{ $self->{bg} };
966
967 $bg->{s} = $rep_x;
968 $bg->{t} = $rep_y;
969 $bg->{wrap_mode} = 1;
970 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1164 }
972 1165
973 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
974 1167
… …
990sub new { 1183sub new {
991 my $class = shift; 1184 my $class = shift;
992 1185
993 $class->SUPER::new ( 1186 $class->SUPER::new (
994 col_expand => [], 1187 col_expand => [],
995 @_ 1188 @_,
996 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1194}
998 1195
999sub add { 1196sub add {
1000 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1001 1198
1002 $child->set_parent ($self); 1199 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1004 1201
1005 $child->check_size; 1202 $self->realloc;
1006} 1203}
1007 1204
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
1012# 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?
1013sub clear { 1206sub clear {
1014 my ($self) = @_; 1207 my ($self) = @_;
1015 1208
1016 my @children = $self->children; 1209 my @children = $self->children;
1017 delete $self->{children}; 1210 delete $self->{children};
… …
1019 for (@children) { 1212 for (@children) {
1020 delete $_->{parent}; 1213 delete $_->{parent};
1021 $_->hide; 1214 $_->hide;
1022 } 1215 }
1023 1216
1024 $self->update; 1217 $self->realloc;
1025} 1218}
1026 1219
1027sub get_wh { 1220sub get_wh {
1028 my ($self) = @_; 1221 my ($self) = @_;
1029 1222
… …
1060sub size_allocate { 1253sub size_allocate {
1061 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
1062 1255
1063 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1064 1257
1065 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
1067 1260
1068 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1125 } 1318 }
1126} 1319}
1127 1320
1128############################################################################# 1321#############################################################################
1129 1322
1130package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1131
1132# TODO: wrap into common Box base class
1133 1324
1134our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1135 1326
1136sub size_request { 1327sub size_request {
1137 my ($self) = @_; 1328 my ($self) = @_;
1138 1329
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1140 1331 ? (
1141 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1142 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1143 (List::Util::max map $_->[1], @alloc), 1334 )
1144 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1145} 1339}
1146 1340
1147sub size_allocate { 1341sub size_allocate {
1148 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1149 1343
1150 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1151
1152 my $children = $self->{children}; 1345 my $children = $self->{children};
1153 1346
1154 my @h = map $_->{req_w}, @$children; 1347 my @req;
1155 1348
1156 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1157 1350 @req = ($space / (@$children || 1)) x @$children;
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } 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 {
1162 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1163 $exp ||= 1;
1164 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1165 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 } 1365 }
1172 } 1366 }
1173 1367
1174 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1175 1369
1176 my $y = 0; 1370 my $pos = 0;
1177 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1180 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1181 1374
1182 $y += $h; 1375 $pos += $alloc;
1183 } 1376 }
1184 1377
1185 1 1378 1
1186} 1379}
1187 1380
1188############################################################################# 1381#############################################################################
1189 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
1190package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1191 1399
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1195 1401
1196sub size_request { 1402sub new {
1197 my ($self) = @_; 1403 my $class = shift;
1198 1404
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1200 1406 vertical => 1,
1201 ( 1407 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1408 )
1205} 1409}
1206 1410
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1411#############################################################################
1247 1412
1248package CFClient::UI::Label; 1413package CFClient::UI::Label;
1249 1414
1250our @ISA = CFClient::UI::Base::; 1415our @ISA = CFClient::UI::DrawBG::;
1251 1416
1252use CFClient::OpenGL; 1417use CFClient::OpenGL;
1253 1418
1254sub new { 1419sub new {
1255 my ($class, %arg) = @_; 1420 my ($class, %arg) = @_;
1256 1421
1257 my $self = $class->SUPER::new ( 1422 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1423 fg => [1, 1, 1],
1424 #bg => none
1425 #active_bg => none
1259 #font => default_font 1426 #font => default_font
1260 #text => initial text 1427 #text => initial text
1261 #markup => initial narkup 1428 #markup => initial narkup
1429 #max_w => maximum pixel width
1430 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1263 fontsize => 1, 1432 fontsize => 1,
1264 align => -1, 1433 align => -1,
1265 valign => -1, 1434 valign => -1,
1266 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1267 can_events => 0, 1437 can_events => 0,
1268 %arg 1438 %arg
1269 ); 1439 );
1270 1440
1271 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1281 } 1451 }
1282 1452
1283 $self 1453 $self
1284} 1454}
1285 1455
1286sub escape { 1456sub escape($) {
1287 local $_ = $_[1]; 1457 local $_ = $_[0];
1288 1458
1289 s/&/&amp;/g; 1459 s/&/&amp;/g;
1290 s/>/&gt;/g; 1460 s/>/&gt;/g;
1291 s/</&lt;/g; 1461 s/</&lt;/g;
1292 1462
1293 $_[1] 1463 $_
1294} 1464}
1295 1465
1296sub update { 1466sub update {
1297 my ($self) = @_; 1467 my ($self) = @_;
1298 1468
… …
1307 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1308 1478
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1311 1481
1482 $self->realloc;
1312 $self->update; 1483 $self->update;
1313 $self->check_size;
1314} 1484}
1315 1485
1316sub set_markup { 1486sub set_markup {
1317 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1318 1488
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1493
1324 $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;
1325 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1326 1496
1497 $self->realloc;
1327 $self->update; 1498 $self->update;
1328 $self->check_size;
1329} 1499}
1330 1500
1331sub size_request { 1501sub size_request {
1332 my ($self) = @_; 1502 my ($self) = @_;
1333 1503
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $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});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1509
1338 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1339 1511
1340 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1345 1517
1346 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1348 } 1520 }
1349 1521
1350 ( 1522 ($w, $h)
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1523}
1355 1524
1356sub size_allocate { 1525sub size_allocate {
1357 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1358 1527
1359 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1360} 1530}
1361 1531
1362sub set_fontsize { 1532sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1364 1534
1365 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1536 delete $self->{texture};
1367 1537
1368 $self->update; 1538 $self->realloc;
1369 $self->check_size;
1370} 1539}
1371 1540
1372sub _draw { 1541sub _draw {
1373 my ($self) = @_; 1542 my ($self) = @_;
1543
1544 $self->SUPER::_draw; # draw background, if applicable
1374 1545
1375 my $tex = $self->{texture} ||= do { 1546 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1547 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1548 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $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});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1553
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382 1555
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1558 : ($self->{w} - $tex->{w}) * 0.5);
1386 1559
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1562 : ($self->{h} - $tex->{h}) * 0.5);
1390 1563
1391 $tex 1564 $tex
1392 }; 1565 };
1393 1566
1394 glEnable GL_TEXTURE_2D; 1567 glEnable GL_TEXTURE_2D;
… …
1422 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1423 can_hover => 1, 1596 can_hover => 1,
1424 can_focus => 1, 1597 can_focus => 1,
1425 valign => 0, 1598 valign => 0,
1426 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1427 @_ 1601 @_
1428 ) 1602 )
1429} 1603}
1430 1604
1431sub _set_text { 1605sub _set_text {
… …
1441 $self->{text} = $text; 1615 $self->{text} = $text;
1442 1616
1443 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1445 1619
1446 $self->emit (changed => $self->{text}); 1620 $self->_emit (changed => $self->{text});
1447} 1621}
1448 1622
1449sub set_text { 1623sub set_text {
1450 my ($self, $text) = @_; 1624 my ($self, $text) = @_;
1451 1625
1452 $self->{cursor} = length $text; 1626 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1627 $self->_set_text ($text);
1454 $self->check_size; 1628
1455 $self->update; 1629 $self->realloc;
1456} 1630}
1457 1631
1458sub get_text { 1632sub get_text {
1459 $_[0]{text} 1633 $_[0]{text}
1460} 1634}
… …
1463 my ($self) = @_; 1637 my ($self) = @_;
1464 1638
1465 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1466 1640
1467 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1468}
1469
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474} 1642}
1475 1643
1476sub key_down { 1644sub key_down {
1477 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1478 1646
… …
1480 my $sym = $ev->{sym}; 1648 my $sym = $ev->{sym};
1481 my $uni = $ev->{unicode}; 1649 my $uni = $ev->{unicode};
1482 1650
1483 my $text = $self->get_text; 1651 my $text = $self->get_text;
1484 1652
1485 if ($sym == 8) { 1653 if ($uni == 8) {
1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1487 } elsif ($sym == 127) { 1655 } elsif ($uni == 127) {
1488 substr $text, $self->{cursor}, 1, ""; 1656 substr $text, $self->{cursor}, 1, "";
1489 } elsif ($sym == CFClient::SDLK_LEFT) { 1657 } elsif ($sym == CFClient::SDLK_LEFT) {
1490 --$self->{cursor} if $self->{cursor}; 1658 --$self->{cursor} if $self->{cursor};
1491 } elsif ($sym == CFClient::SDLK_RIGHT) { 1659 } elsif ($sym == CFClient::SDLK_RIGHT) {
1492 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1660 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1497 } elsif ($sym == 27) { 1665 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1666 $self->_emit ('escape');
1499 } elsif ($uni) { 1667 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1501 } 1669 }
1502 1670
1503 $self->_set_text ($text); 1671 $self->_set_text ($text);
1504 $self->update; 1672
1673 $self->realloc;
1505} 1674}
1506 1675
1507sub focus_in { 1676sub focus_in {
1508 my ($self) = @_; 1677 my ($self) = @_;
1509 1678
… …
1589 if ($sym == 13) { 1758 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1759 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1760 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1; 1761 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1762 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1763 $self->_emit (activate => $txt);
1595 $self->update; 1764 $self->update;
1596 1765
1597 } elsif ($sym == CFClient::SDLK_UP) { 1766 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) { 1767 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text; 1768 $self->{history_saveback} = $self->get_text;
… …
1636 1805
1637sub new { 1806sub new {
1638 my $class = shift; 1807 my $class = shift;
1639 1808
1640 $class->SUPER::new ( 1809 $class->SUPER::new (
1641 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1642 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1645 can_hover => 1, 1814 can_hover => 1,
1646 align => 0, 1815 align => 0,
1647 valign => 0, 1816 valign => 0,
1648 can_events => 1, 1817 can_events => 1,
1649 @_ 1818 @_
1650 ) 1819 )
1651} 1820}
1652 1821
1822sub activate { }
1823
1653sub button_up { 1824sub button_up {
1654 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1655 1826
1827 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate");
1659 }
1660} 1830}
1661 1831
1662sub _draw { 1832sub _draw {
1663 my ($self) = @_; 1833 my ($self) = @_;
1664 1834
… …
1693 1863
1694sub new { 1864sub new {
1695 my $class = shift; 1865 my $class = shift;
1696 1866
1697 $class->SUPER::new ( 1867 $class->SUPER::new (
1698 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1699 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1700 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],
1701 state => 0, 1874 state => 0,
1702 can_hover => 1, 1875 can_hover => 1,
1703 @_ 1876 @_
1704 ) 1877 )
1705} 1878}
1706 1879
1707sub size_request { 1880sub size_request {
1708 my ($self) = @_; 1881 my ($self) = @_;
1709 1882
1710 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1711} 1884}
1712 1885
1713sub button_down { 1886sub button_down {
1714 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1715 1888
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1720 } 1893 }
1721} 1894}
1722 1895
1723sub _draw { 1896sub _draw {
1724 my ($self) = @_; 1897 my ($self) = @_;
1725 1898
1726 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1727 1900
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 1902
1730 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;
1731 1906
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1908
1734 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735 1910
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2164 qw(s1_slider.png s1_slider_bg.png);
1990 2165
1991sub new { 2166sub new {
1992 my $class = shift; 2167 my $class = shift;
1993 2168
1994 # range [value, low, high, page] 2169 # range [value, low, high, page, unit]
1995 2170
1996 # TODO: 0-width page 2171 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2172 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2173 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2001 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],
2002 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2005 vertical => 0, 2182 vertical => 0,
2006 can_hover => 1, 2183 can_hover => 1,
2007 inner_pad => 5, 2184 inner_pad => 0.02,
2008 @_ 2185 @_
2009 ); 2186 );
2010 2187
2188 $self->set_value ($self->{range}[0]);
2189 $self->update;
2190
2011 $self 2191 $self
2012} 2192}
2013 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
2014sub size_request { 2228sub size_request {
2015 my ($self) = @_; 2229 my ($self) = @_;
2016 2230
2017 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2232}
2022 2233
2023sub button_down { 2234sub button_down {
2024 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2025 2236
2026 $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
2027 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2028} 2242}
2029 2243
2030sub mouse_motion { 2244sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2032 2246
2033 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
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2035 2266
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2268
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2271
2041 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2274
2047 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2276 $self->{knob_w} = $knob_w;
2049 } 2277 });
2050}
2051 2278
2052# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2280}
2059 2281
2060sub _draw { 2282sub _draw {
2061 my ($self) = @_; 2283 my ($self) = @_;
2062 2284
2063 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
2064 2286
2065 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
2066 2288
2067 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2069 2291
2292 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2294 }
2075 2295
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2298
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2301
2100 # draw background 2302 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2304
2103 # draw handle 2305 # draw handle
2104 $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);
2105 2307
2106 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2107} 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 (@_) }
2108 2351
2109############################################################################# 2352#############################################################################
2110 2353
2111package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2112 2355
… …
2142 2385
2143 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2387 $self->reflow;
2145} 2388}
2146 2389
2147sub text_height {
2148 my ($self, $text) = @_;
2149
2150 my $layout = $self->{layout};
2151
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w});
2154 $layout->set_markup ($text);
2155
2156 ($layout->size)[1]
2157}
2158
2159sub reflow {
2160 my ($self) = @_;
2161
2162 $self->{need_reflow}++;
2163 $self->update;
2164}
2165
2166sub size_allocate { 2390sub size_allocate {
2167 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2168 2392
2169 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2170 2394
… …
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2174 2398
2175 $self->reflow; 2399 $self->reflow;
2176} 2400}
2177 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
2178sub add_paragraph { 2436sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2180 2438
2181 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2182 2440 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2186 2444
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $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]);
2190 $self->{children}[1]->update;
2191} 2446}
2192 2447
2193sub update { 2448sub update {
2194 my ($self) = @_; 2449 my ($self) = @_;
2195 2450
… …
2198 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2199 2454
2200 delete $self->{texture}; 2455 delete $self->{texture};
2201 2456
2202 $ROOT->on_post_alloc ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2203 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2461 my $height = 0;
2205 2462
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2207 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 }
2208 2478
2209 $self->{height} = $height; 2479 $self->{height} = $height;
2210 2480
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2482
2213 delete $self->{texture}; 2483 delete $self->{texture};
2214 } 2484 }
2215 2485
2216 $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 {
2217 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2219 2489
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2490 my $top = int $self->{children}[1]{range}[0];
2224 2491
2225 my $y0 = $top; 2492 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2493 my $y1 = $top + $H;
2227 2494
2228 my $y = 0; 2495 my $y = 0;
2229 2496
2230 my $layout = $self->{layout}; 2497 my $layout = $self->{layout};
2231 2498
2232 $layout->set_font ($self->{font}) if $self->{font}; 2499 $layout->set_font ($self->{font}) if $self->{font};
2233 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
2234 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2506 my $h = $par->[1];
2236 2507
2237 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2239 $layout->set_markup ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2240 2512
2241 my ($W, $H) = $layout->size; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 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;
2243 } 2517 }
2244 2518
2245 $y += $h; 2519 $y += $h;
2246 } 2520 }
2247 2521
2248 glDisable GL_TEXTURE_2D; 2522 glDisable GL_BLEND;
2249 }; 2523 };
2250 }); 2524 });
2251} 2525}
2252 2526
2253sub _draw { 2527sub _draw {
2254 my ($self) = @_; 2528 my ($self) = @_;
2255 2529
2256 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2259 $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});
2260 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2261 2535
2262 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2263 2537
2264} 2538}
… …
2313 2587
2314sub new { 2588sub new {
2315 my $class = shift; 2589 my $class = shift;
2316 2590
2317 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2318 state => 0, 2592 state => 0,
2319 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2320 @_ 2594 @_
2321 ); 2595 );
2322 2596
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2597 $self
2329} 2598}
2330 2599
2331sub toggle_flopper { 2600sub toggle_flopper {
2332 my ($self) = @_; 2601 my ($self) = @_;
2333 2602
2334 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 2604}
2346 2605
2347############################################################################# 2606#############################################################################
2348 2607
2349package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2362} 2621}
2363 2622
2364sub set_tooltip_from { 2623sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2366 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
2367 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2638 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2640 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2642 );
2374} 2643}
2375 2644
2376sub size_request { 2645sub size_request {
2377 my ($self) = @_; 2646 my ($self) = @_;
… …
2383 2652
2384sub size_allocate { 2653sub size_allocate {
2385 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2386 2655
2387 $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 });
2388} 2675}
2389 2676
2390sub _draw { 2677sub _draw {
2391 my ($self) = @_; 2678 my ($self) = @_;
2392 2679
… …
2409 glVertex $w, $h; 2696 glVertex $w, $h;
2410 glVertex $w, 0; 2697 glVertex $w, 0;
2411 glEnd; 2698 glEnd;
2412 2699
2413 glTranslate 2 - 0.375, 2 - 0.375; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2701
2414 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2415} 2703}
2416 2704
2417############################################################################# 2705#############################################################################
2418 2706
… …
2423use CFClient::OpenGL; 2711use CFClient::OpenGL;
2424 2712
2425sub new { 2713sub new {
2426 my $class = shift; 2714 my $class = shift;
2427 2715
2428 $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2429 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2430 @_, 2719 @_,
2431 ) 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
2432} 2737}
2433 2738
2434sub size_request { 2739sub size_request {
2435 (32, 8) 2740 (32, 8)
2436} 2741}
2437 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2438sub _draw { 2751sub _draw {
2439 my ($self) = @_; 2752 my ($self) = @_;
2440 2753
2441 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
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2766
2444 # TODO animation
2445 if ($tex) { 2767 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2768 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2770 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2451 } 2773 }
2452} 2774}
2453 2775
2454############################################################################# 2776sub DESTROY {
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_; 2777 my ($self) = @_;
2539 2778
2540 $self->{scrolled}->clear; 2779 $self->{timer}->cancel
2541 return unless $items; 2780 if $self->{timer};
2542 2781
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2782 $self->SUPER::DESTROY;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561} 2783}
2562 2784
2563############################################################################# 2785#############################################################################
2564 2786
2565package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
… …
2600 2822
2601# 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)
2602sub popup { 2824sub popup {
2603 my ($self, $ev) = @_; 2825 my ($self, $ev) = @_;
2604 2826
2605 $self->emit ("popdown"); 2827 $self->_emit ("popdown");
2606 2828
2607 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self; 2830 $GRAB = $self;
2609 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2610 2832
2611 $self->show; 2833 $self->show;
2612 $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);
2613} 2835}
2614 2836
2615sub mouse_motion { 2837sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2617 2839
… …
2625 2847
2626 if ($ev->{button} == $self->{button}) { 2848 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB; 2849 undef $GRAB;
2628 $self->hide; 2850 $self->hide;
2629 2851
2630 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover}; 2853 $self->{hover}[1]->() if $self->{hover};
2632 } 2854 }
2633} 2855}
2634 2856
2635############################################################################# 2857#############################################################################
2636 2858
2637package CFClient::UI::Statusbox; 2859package CFClient::UI::Statusbox;
2638 2860
2639our @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}
2640 2871
2641sub reorder { 2872sub reorder {
2642 my ($self) = @_; 2873 my ($self) = @_;
2643 my $NOW = time; 2874 my $NOW = time;
2644 2875
… …
2663 ? "<b>$item->{count} ×</b> $item->{text}" 2894 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text}; 2895 : $item->{text};
2665 2896
2666 for ($short) { 2897 for ($short) {
2667 s/^\s+//; 2898 s/^\s+//;
2668 s/\012.*/…/s; 2899 s/\s+/ /g;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 } 2900 }
2672 2901
2673 new CFClient::UI::Label 2902 new CFClient::UI::Label
2674 markup => $short, 2903 markup => $short,
2675 tooltip => $item->{tooltip}, 2904 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP, 2905 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67, 2906 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize}, 2907 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44,
2679 color => $item->{color}, 2909 fg => $item->{fg},
2680 can_events => 1, 2910 can_events => 1,
2681 can_hover => 1 2911 can_hover => 1
2682 }; 2912 };
2683 } 2913 }
2684 2914
… …
2689sub add { 2919sub add {
2690 my ($self, $text, %arg) = @_; 2920 my ($self, $text, %arg) = @_;
2691 2921
2692 $text =~ s/^\s+//; 2922 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//; 2923 $text =~ s/\s+$//;
2924
2925 return unless $text;
2694 2926
2695 my $timeout = time + ((delete $arg{timeout}) || 60); 2927 my $timeout = time + ((delete $arg{timeout}) || 60);
2696 2928
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698 2930
… …
2710 $self->{item}{$group} = { 2942 $self->{item}{$group} = {
2711 id => ++$self->{id}, 2943 id => ++$self->{id},
2712 text => $text, 2944 text => $text,
2713 timeout => $timeout, 2945 timeout => $timeout,
2714 tooltip => $text, 2946 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8], 2947 fg => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0, 2948 pri => 0,
2718 count => 1, 2949 count => 1,
2719 %arg, 2950 %arg,
2720 }; 2951 };
2721 } 2952 }
2722 2953
2723 $self->reorder; 2954 $self->reorder;
2724} 2955}
2725 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
2726############################################################################# 2967#############################################################################
2727 2968
2728package CFClient::UI::Root; 2969package CFClient::UI::Inventory;
2729 2970
2730our @ISA = CFClient::UI::Container::; 2971our @ISA = CFClient::UI::ScrolledWindow::;
2731
2732use CFClient::OpenGL;
2733 2972
2734sub new { 2973sub new {
2735 my $class = shift; 2974 my $class = shift;
2736 2975
2737 $class->SUPER::new ( 2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_, 2978 @_,
2739 ) 2979 );
2740}
2741 2980
2742sub 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 {
2743 my ($self, $x, $y, $w, $h) = @_; 3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2744 3130
2745 $self->{w} = $w; 3131 $self->clear_command_list;
2746 $self->{h} = $h; 3132 $self->{recording} = 0;
2747} 3133 $self->{rec_btn}->set_text ("start recording");
2748 3134
2749sub 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 {
2750 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}
2751 3153
2752 $self->size_allocate ($self->{w}, $self->{h}) 3154sub update_binding_widgets {
2753 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
2754} 3277}
2755 3278
2756sub size_request { 3279sub size_request {
2757 my ($self) = @_; 3280 my ($self) = @_;
2758 3281
2759 ($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
2760} 3297}
2761 3298
2762sub size_allocate { 3299sub size_allocate {
2763 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2764 3301
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2781 for my $child ($self->children) { 3302 for my $child ($self->children) {
2782 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)};
2783 3304
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3305 $X = $child->{force_x} if exists $child->{force_x};
2785 $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
2786 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
2787 } 3312 }
2788
2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791} 3313}
2792 3314
2793sub coord2local { 3315sub coord2local {
2794 my ($self, $x, $y) = @_; 3316 my ($self, $x, $y) = @_;
2795 3317
… …
2803} 3325}
2804 3326
2805sub update { 3327sub update {
2806 my ($self) = @_; 3328 my ($self) = @_;
2807 3329
2808 $self->check_size;
2809 $::WANT_REFRESH++; 3330 $::WANT_REFRESH++;
2810} 3331}
2811 3332
2812sub add { 3333sub add {
2813 my ($self, $child) = @_; 3334 my ($self, @children) = @_;
2814 3335
2815 # integerise window positions 3336 $_->{is_toplevel} = 1
2816 $child->{x} = int $child->{x}; 3337 for @children;
2817 $child->{y} = int $child->{y};
2818 3338
2819 $self->SUPER::add ($child); 3339 $self->SUPER::add (@children);
3340}
3341
3342sub remove {
3343 my ($self, @children) = @_;
3344
3345 $self->SUPER::remove (@children);
3346
3347 delete $self->{is_toplevel}
3348 for @children;
3349
3350 while (@children) {
3351 my $w = pop @children;
3352 push @children, $w->children;
3353 $w->set_invisible;
3354 }
2820} 3355}
2821 3356
2822sub on_refresh { 3357sub on_refresh {
2823 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2824 3359
… …
2837 while ($self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2838 $_->() 3373 $_->()
2839 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
2840 } 3375 }
2841 3376
2842 if ($self->{check_size}) { 3377 if ($self->{realloc}) {
2843 my @queue = ([], []); 3378 my %queue;
3379 my @queue;
3380 my $widget;
2844 3381
2845 for (;;) { 3382 outer:
2846 if ($self->{check_size}) { 3383 while () {
2847 # heuristic: check containers last 3384 if (my $realloc = delete $self->{realloc}) {
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3385 for $widget (values %$realloc) {
2849 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 }
2850 } 3392 }
2851 3393
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3394 while () {
3395 @queue or last outer;
2853 3396
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3397 $widget = pop @{ $queue[-1] || [] }
2855 ? @$widget{qw(user_w user_h)} 3398 and last;
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861 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}) {
2862 $widget->{req_w} = $w; 3415 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h; 3416 $widget->{req_h} = $h;
2864 3417
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3418 $self->{size_alloc}{$widget+0} = $widget;
2866 3419
2867 $widget->{parent}->check_size
2868 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 }
2869 } 3427 }
3428
3429 delete $self->{realloc}{$widget+0};
2870 } 3430 }
2871 } 3431 }
2872 3432
2873 while ($self->{size_alloc}) { 3433 while (my $size_alloc = delete $self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) { 3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
2875 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)};
2876 3441
2877 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
2879 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
2880 $widget->{w} = $w; 3452 $widget->{w} = $w;
2881 $widget->{h} = $h; 3453 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h); 3454
2883 $widget->emit (size_allocate => $w, $h); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
2884 } 3457 }
2885 } 3458 }
2886 3459
2887 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
2888 $_->() 3461 $_->()
2889 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
2890 } 3463 }
2891 3464
3465
2892 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
2895 3469
2896 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
2897 glLoadIdentity; 3471 glLoadIdentity;
2898 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2899 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
2900 glLoadIdentity; 3474 glLoadIdentity;
2901 3475
2902 $self->_draw; 3476 $self->_draw;
2903} 3477}
… …
2905############################################################################# 3479#############################################################################
2906 3480
2907package CFClient::UI; 3481package CFClient::UI;
2908 3482
2909$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip; 3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2911 3485
29121 34861
2913 3487

Diff Legend

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