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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 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};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $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;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
278} 376}
279 377
280sub set_max_size { 378sub set_max_size {
281 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 383}
286 384
287sub set_tooltip { 385sub set_tooltip {
288 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
289 392
290 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
291 394
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 418 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
317 420
318 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
319 422
320 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
321 424
322 $focus->update if $focus; 425 $focus->update if $focus;
323 $FOCUS->update; 426 $FOCUS->update;
324} 427}
325 428
… …
328 431
329 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
330 433
331 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
332 435
333 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
334 437
335 $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;
336} 442}
337 443
338sub mouse_motion { } 444sub mouse_motion { }
339sub button_up { } 445sub button_up { }
340sub key_down { } 446sub key_down { }
341sub key_up { } 447sub key_up { }
342 448
343sub button_down { 449sub button_down {
344 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
345 451
346 $self->focus_in; 452 $self->focus_in;
… …
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
353sub 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}
354 530
355sub draw { 531sub draw {
356 my ($self) = @_; 532 my ($self) = @_;
357 533
358 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
375 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
376 glEnd; 552 glEnd;
377 glDisable GL_BLEND; 553 glDisable GL_BLEND;
378 } 554 }
379 555
380 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
381 glPushMatrix; 557 glPushMatrix;
382 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 561 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
389 glEnd; 565 glEnd;
390 glPopMatrix; 566 glPopMatrix;
391 #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;
392 } 568 }
393} 569}
394 570
395sub _draw { 571sub _draw {
396 my ($self) = @_; 572 my ($self) = @_;
397 573
398 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 575}
448 576
449sub DESTROY { 577sub DESTROY {
450 my ($self) = @_; 578 my ($self) = @_;
451 579
… …
509 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
511} 639}
512 640
513sub size_request { 641sub size_request {
514 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
515} 645}
516 646
517sub draw { } 647sub draw { }
518 648
519############################################################################# 649#############################################################################
… …
548 $self->{children} = [ 678 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 680 @{$self->{children}}, @widgets
551 ]; 681 ];
552 682
553 $self->check_size (1); 683 $self->realloc;
554 $self->update;
555} 684}
556 685
557sub children { 686sub children {
558 @{ $_[0]{children} } 687 @{ $_[0]{children} }
559} 688}
… …
564 delete $child->{parent}; 693 delete $child->{parent};
565 $child->hide; 694 $child->hide;
566 695
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 697
569 $self->check_size; 698 $self->realloc;
570 $self->update;
571} 699}
572 700
573sub clear { 701sub clear {
574 my ($self) = @_; 702 my ($self) = @_;
575 703
… …
579 for (@$children) { 707 for (@$children) {
580 delete $_->{parent}; 708 delete $_->{parent};
581 $_->hide; 709 $_->hide;
582 } 710 }
583 711
584 $self->check_size; 712 $self->realloc;
585 $self->update;
586} 713}
587 714
588sub find_widget { 715sub find_widget {
589 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
590 717
… …
688 $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 {
689 glClearColor 0, 0, 0, 0; 816 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 817 glClear GL_COLOR_BUFFER_BIT;
691 818
692 $self->_render; 819 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 820 };
701} 821}
702 822
703sub _draw { 823sub _draw {
704 my ($self) = @_; 824 my ($self) = @_;
… …
708 my $tex = $self->{texture} 828 my $tex = $self->{texture}
709 or return; 829 or return;
710 830
711 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 833 glColor 1, 1, 1, 1;
714 834
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 836
717 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
718} 838}
… …
721 841
722package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
723 843
724our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
725 845
846sub new {
847 my $class = shift;
848
849 $class->SUPER::new (
850 scroll_x => 0,
851 scroll_y => 1,
852 @_,
853 )
854}
855
726sub size_request { 856sub size_request {
727 my ($self) = @_; 857 my ($self) = @_;
728 858
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 860
732 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
733} 865}
734 866
735sub size_allocate { 867sub size_allocate {
736 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
737 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);
738 $self->update; 876 $self->update;
739} 877}
740 878
741sub set_offset { 879sub set_offset {
742 my ($self, $x, $y) = @_; 880 my ($self, $x, $y) = @_;
… …
793 my $class = shift; 931 my $class = shift;
794 932
795 my $self; 933 my $self;
796 934
797 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
798 vertical => 1, 936 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 938 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 939 $self->{vp}->set_offset (0, $_[1]);
802 }, 940 },
803 ; 941 ;
804 942
805 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 944 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 945 slider => $slider,
808 @_, 946 @_,
809 ); 947 );
810 948
811 $self->{vp}->add ($self->{scrolled}); 949 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 950 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 951 $self->add ($self->{slider});
814 952
815 $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]);
816} 973}
817 974
818#TODO# update range on size_allocate depending on child 975#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 976# update viewport offset on scroll
820 977
… …
864 1021
865our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
866 1023
867use CFClient::OpenGL; 1024use CFClient::OpenGL;
868 1025
869my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 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);
872 1033
873sub new { 1034sub new {
874 my $class = shift; 1035 my $class = shift;
875 1036
876 # TODO: user_x, user_y, overwrite moveto?
877
878 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1040 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
884 @_ 1044 @_
885 ); 1045 );
886 1046
887 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 1048 align => 0,
… …
941 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
942 1102
943 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
945 1105
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1111 };
951 1112
952 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1117 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
958 1119
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
960 1121
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1123 };
964 } 1124 }
965} 1125}
966 1126
967sub button_up { 1127sub button_up {
… …
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1147
988 my $border = $self->border; 1148 my $border = $self->border;
989 1149
990 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1155
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
998 1158
999 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1162 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1164 }
1010 1165
1011 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
1012 1167
… …
1028sub new { 1183sub new {
1029 my $class = shift; 1184 my $class = shift;
1030 1185
1031 $class->SUPER::new ( 1186 $class->SUPER::new (
1032 col_expand => [], 1187 col_expand => [],
1033 @_ 1188 @_,
1034 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1194}
1036 1195
1037sub add { 1196sub add {
1038 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1039 1198
1040 $child->set_parent ($self); 1199 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1042 1201
1043 $child->check_size; 1202 $self->realloc;
1044} 1203}
1045 1204
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# 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?
1051sub clear { 1206sub clear {
1052 my ($self) = @_; 1207 my ($self) = @_;
1053 1208
1054 my @children = $self->children; 1209 my @children = $self->children;
1055 delete $self->{children}; 1210 delete $self->{children};
… …
1057 for (@children) { 1212 for (@children) {
1058 delete $_->{parent}; 1213 delete $_->{parent};
1059 $_->hide; 1214 $_->hide;
1060 } 1215 }
1061 1216
1062 $self->update; 1217 $self->realloc;
1063} 1218}
1064 1219
1065sub get_wh { 1220sub get_wh {
1066 my ($self) = @_; 1221 my ($self) = @_;
1067 1222
… …
1098sub size_allocate { 1253sub size_allocate {
1099 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
1100 1255
1101 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1102 1257
1103 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
1105 1260
1106 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1318 }
1164} 1319}
1165 1320
1166############################################################################# 1321#############################################################################
1167 1322
1168package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1324
1172our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1173 1326
1174sub size_request { 1327sub size_request {
1175 my ($self) = @_; 1328 my ($self) = @_;
1176 1329
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1178 1331 ? (
1179 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1334 )
1182 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1183} 1339}
1184 1340
1185sub size_allocate { 1341sub size_allocate {
1186 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1187 1343
1188 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1345 my $children = $self->{children};
1191 1346
1192 my @h = map $_->{req_w}, @$children; 1347 my @req;
1193 1348
1194 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1195 1350 @req = ($space / (@$children || 1)) x @$children;
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } 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 {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 } 1365 }
1210 } 1366 }
1211 1367
1212 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1213 1369
1214 my $y = 0; 1370 my $pos = 0;
1215 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1374
1220 $y += $h; 1375 $pos += $alloc;
1221 } 1376 }
1222 1377
1223 1 1378 1
1224} 1379}
1225 1380
1226############################################################################# 1381#############################################################################
1227 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
1228package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1229 1399
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1233 1401
1234sub size_request { 1402sub new {
1235 my ($self) = @_; 1403 my $class = shift;
1236 1404
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1238 1406 vertical => 1,
1239 ( 1407 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1408 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1409}
1283 1410
1284############################################################################# 1411#############################################################################
1285 1412
1286package CFClient::UI::Label; 1413package CFClient::UI::Label;
… …
1297 #bg => none 1424 #bg => none
1298 #active_bg => none 1425 #active_bg => none
1299 #font => default_font 1426 #font => default_font
1300 #text => initial text 1427 #text => initial text
1301 #markup => initial narkup 1428 #markup => initial narkup
1429 #max_w => maximum pixel width
1430 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1303 fontsize => 1, 1432 fontsize => 1,
1304 align => -1, 1433 align => -1,
1305 valign => -1, 1434 valign => -1,
1306 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1307 can_events => 0, 1437 can_events => 0,
1308 %arg 1438 %arg
1309 ); 1439 );
1310 1440
1311 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1348 1478
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1351 1481
1482 $self->realloc;
1352 $self->update; 1483 $self->update;
1353 $self->check_size;
1354} 1484}
1355 1485
1356sub set_markup { 1486sub set_markup {
1357 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1358 1488
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1493
1364 $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;
1365 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1366 1496
1497 $self->realloc;
1367 $self->update; 1498 $self->update;
1368 $self->check_size;
1369} 1499}
1370 1500
1371sub size_request { 1501sub size_request {
1372 my ($self) = @_; 1502 my ($self) = @_;
1373 1503
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $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});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1509
1378 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1379 1511
1380 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1385 1517
1386 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1388 } 1520 }
1389 1521
1390 ( 1522 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1523}
1395 1524
1396sub size_allocate { 1525sub size_allocate {
1397 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1398 1527
1399 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1530}
1401 1531
1402sub set_fontsize { 1532sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1404 1534
1405 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1536 delete $self->{texture};
1407 1537
1408 $self->update; 1538 $self->realloc;
1409 $self->check_size;
1410} 1539}
1411 1540
1412sub _draw { 1541sub _draw {
1413 my ($self) = @_; 1542 my ($self) = @_;
1414 1543
… …
1416 1545
1417 my $tex = $self->{texture} ||= do { 1546 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1547 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1548 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $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});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1553
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1555
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1558 : ($self->{w} - $tex->{w}) * 0.5);
1428 1559
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1562 : ($self->{h} - $tex->{h}) * 0.5);
1432 1563
1433 $tex 1564 $tex
1434 }; 1565 };
1435 1566
… …
1464 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1465 can_hover => 1, 1596 can_hover => 1,
1466 can_focus => 1, 1597 can_focus => 1,
1467 valign => 0, 1598 valign => 0,
1468 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1469 @_ 1601 @_
1470 ) 1602 )
1471} 1603}
1472 1604
1473sub _set_text { 1605sub _set_text {
… …
1483 $self->{text} = $text; 1615 $self->{text} = $text;
1484 1616
1485 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1487 1619
1488 $self->emit (changed => $self->{text}); 1620 $self->_emit (changed => $self->{text});
1489} 1621}
1490 1622
1491sub set_text { 1623sub set_text {
1492 my ($self, $text) = @_; 1624 my ($self, $text) = @_;
1493 1625
1494 $self->{cursor} = length $text; 1626 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1627 $self->_set_text ($text);
1496 $self->update; 1628
1497 $self->check_size; 1629 $self->realloc;
1498} 1630}
1499 1631
1500sub get_text { 1632sub get_text {
1501 $_[0]{text} 1633 $_[0]{text}
1502} 1634}
… …
1505 my ($self) = @_; 1637 my ($self) = @_;
1506 1638
1507 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1508 1640
1509 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1642}
1517 1643
1518sub key_down { 1644sub key_down {
1519 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1520 1646
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1665 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1666 $self->_emit ('escape');
1541 } elsif ($uni) { 1667 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1669 }
1544 1670
1545 $self->_set_text ($text); 1671 $self->_set_text ($text);
1546 $self->update; 1672
1547 $self->check_size; 1673 $self->realloc;
1548} 1674}
1549 1675
1550sub focus_in { 1676sub focus_in {
1551 my ($self) = @_; 1677 my ($self) = @_;
1552 1678
… …
1632 if ($sym == 13) { 1758 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1759 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1760 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1761 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1762 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1763 $self->_emit (activate => $txt);
1638 $self->update; 1764 $self->update;
1639 1765
1640 } elsif ($sym == CFClient::SDLK_UP) { 1766 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1767 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1768 $self->{history_saveback} = $self->get_text;
… …
1679 1805
1680sub new { 1806sub new {
1681 my $class = shift; 1807 my $class = shift;
1682 1808
1683 $class->SUPER::new ( 1809 $class->SUPER::new (
1684 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1685 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1687 can_hover => 1, 1814 can_hover => 1,
1688 align => 0, 1815 align => 0,
1689 valign => 0, 1816 valign => 0,
1690 can_events => 1, 1817 can_events => 1,
1691 @_ 1818 @_
1692 ) 1819 )
1693} 1820}
1694 1821
1822sub activate { }
1823
1695sub button_up { 1824sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1697 1826
1827 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1830}
1703 1831
1704sub _draw { 1832sub _draw {
1705 my ($self) = @_; 1833 my ($self) = @_;
1706 1834
… …
1735 1863
1736sub new { 1864sub new {
1737 my $class = shift; 1865 my $class = shift;
1738 1866
1739 $class->SUPER::new ( 1867 $class->SUPER::new (
1740 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1741 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1872 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1873 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1874 state => 0,
… …
1749} 1878}
1750 1879
1751sub size_request { 1880sub size_request {
1752 my ($self) = @_; 1881 my ($self) = @_;
1753 1882
1754 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1755} 1884}
1756 1885
1757sub button_down { 1886sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1759 1888
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1764 } 1893 }
1765} 1894}
1766 1895
1767sub _draw { 1896sub _draw {
1768 my ($self) = @_; 1897 my ($self) = @_;
1769 1898
1770 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1771 1900
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1902
1774 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;
1775 1906
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1908
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1910
… …
2043 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2176 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2177 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2178 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2051 vertical => 0, 2182 vertical => 0,
2052 can_hover => 1, 2183 can_hover => 1,
2053 inner_pad => .05, 2184 inner_pad => 0.02,
2054 @_ 2185 @_
2055 ); 2186 );
2056 2187
2057 $self->set_value ($self->{range}[0]); 2188 $self->set_value ($self->{range}[0]);
2058 $self->update; 2189 $self->update;
2059 2190
2060 $self 2191 $self
2061} 2192}
2062 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
2063sub set_value { 2205sub set_value {
2064 my ($self, $value) = @_; 2206 my ($self, $value) = @_;
2065 2207
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2208 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2209
2068 $hi = $lo + 1 if $hi <= $lo; 2210 $hi = $lo + 1 if $hi <= $lo;
2069 2211
2212 $page = $hi - $lo if $page > $hi - $lo;
2213
2070 $value = $lo if $value < $lo; 2214 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2215 $value = $hi - $page if $value > $hi - $page;
2072 2216
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2217 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2218 if $unit;
2075 2219
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2221
2080 if ($value != $old_value) { 2222 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2223 $self->_emit (changed => $value);
2082 $self->update; 2224 $self->update;
2083 } 2225 }
2084} 2226}
2085 2227
2086sub size_request { 2228sub size_request {
2087 my ($self) = @_; 2229 my ($self) = @_;
2088 2230
2089 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2232}
2094 2233
2095sub button_down { 2234sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2097 2236
2098 $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
2099 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2100} 2242}
2101 2243
2102sub mouse_motion { 2244sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2249
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2251
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2253
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2255 }
2114} 2256}
2115 2257
2116sub update { 2258sub update {
2117 my ($self) = @_; 2259 my ($self) = @_;
2118 2260
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2262 $self->set_value ($self->{range}[0]);
2121 2263
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2123 2266
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2268
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2271
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2272 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2273 $value = $value * $self->{scale} + $self->{offset};
2130 2274
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2276 $self->{knob_w} = $knob_w;
2138 }); 2277 });
2139 2278
2140 $self->SUPER::update; 2279 $self->SUPER::update;
2141} 2280}
2142 2281
… …
2148 glScale $self->{w}, $self->{h}; 2287 glScale $self->{w}, $self->{h};
2149 2288
2150 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2152 2291
2292 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2294 }
2156 2295
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2298
… …
2166 # draw handle 2305 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2306 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2307
2169 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2170} 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 (@_) }
2171 2351
2172############################################################################# 2352#############################################################################
2173 2353
2174package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2175 2355
… …
2205 2385
2206 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2387 $self->reflow;
2208} 2388}
2209 2389
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2390sub size_allocate {
2230 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2231 2392
2232 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2233 2394
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2398
2238 $self->reflow; 2399 $self->reflow;
2239} 2400}
2240 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
2241sub add_paragraph { 2436sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2243 2438
2244 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2245 2440 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2249 2444
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $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]);
2253 $self->{children}[1]->update;
2254} 2446}
2255 2447
2256sub update { 2448sub update {
2257 my ($self) = @_; 2449 my ($self) = @_;
2258 2450
… …
2261 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2262 2454
2263 delete $self->{texture}; 2455 delete $self->{texture};
2264 2456
2265 $ROOT->on_post_alloc ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2266 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2461 my $height = 0;
2268 2462
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2270 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 }
2271 2478
2272 $self->{height} = $height; 2479 $self->{height} = $height;
2273 2480
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2482
2276 delete $self->{texture}; 2483 delete $self->{texture};
2277 } 2484 }
2278 2485
2279 $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 {
2280 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2282 2489
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2490 my $top = int $self->{children}[1]{range}[0];
2287 2491
2288 my $y0 = $top; 2492 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2493 my $y1 = $top + $H;
2290 2494
2291 my $y = 0; 2495 my $y = 0;
2292 2496
2293 my $layout = $self->{layout}; 2497 my $layout = $self->{layout};
2294 2498
2295 $layout->set_font ($self->{font}) if $self->{font}; 2499 $layout->set_font ($self->{font}) if $self->{font};
2296 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
2297 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2506 my $h = $par->[1];
2299 2507
2300 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2303 2512
2304 my ($W, $H) = $layout->size; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 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;
2306 } 2517 }
2307 2518
2308 $y += $h; 2519 $y += $h;
2309 } 2520 }
2310 2521
2311 glDisable GL_TEXTURE_2D; 2522 glDisable GL_BLEND;
2312 }; 2523 };
2313 }); 2524 });
2314} 2525}
2315 2526
2316sub _draw { 2527sub _draw {
2317 my ($self) = @_; 2528 my ($self) = @_;
2318 2529
2319 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2322 $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});
2323 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2324 2535
2325 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2326 2537
2327} 2538}
… …
2376 2587
2377sub new { 2588sub new {
2378 my $class = shift; 2589 my $class = shift;
2379 2590
2380 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2381 state => 0, 2592 state => 0,
2382 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2383 @_ 2594 @_
2384 ); 2595 );
2385 2596
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2597 $self
2392} 2598}
2393 2599
2394sub toggle_flopper { 2600sub toggle_flopper {
2395 my ($self) = @_; 2601 my ($self) = @_;
2396 2602
2397 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2604}
2409 2605
2410############################################################################# 2606#############################################################################
2411 2607
2412package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2425} 2621}
2426 2622
2427sub set_tooltip_from { 2623sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2429 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
2430 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2638 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2640 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2642 );
2437} 2643}
2438 2644
2439sub size_request { 2645sub size_request {
2440 my ($self) = @_; 2646 my ($self) = @_;
… …
2446 2652
2447sub size_allocate { 2653sub size_allocate {
2448 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2449 2655
2450 $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 });
2451} 2675}
2452 2676
2453sub _draw { 2677sub _draw {
2454 my ($self) = @_; 2678 my ($self) = @_;
2455 2679
… …
2472 glVertex $w, $h; 2696 glVertex $w, $h;
2473 glVertex $w, 0; 2697 glVertex $w, 0;
2474 glEnd; 2698 glEnd;
2475 2699
2476 glTranslate 2 - 0.375, 2 - 0.375; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2701
2477 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2478} 2703}
2479 2704
2480############################################################################# 2705#############################################################################
2481 2706
… …
2486use CFClient::OpenGL; 2711use CFClient::OpenGL;
2487 2712
2488sub new { 2713sub new {
2489 my $class = shift; 2714 my $class = shift;
2490 2715
2491 $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2492 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2493 @_, 2719 @_,
2494 ) 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
2495} 2737}
2496 2738
2497sub size_request { 2739sub size_request {
2498 (32, 8) 2740 (32, 8)
2499} 2741}
2500 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2501sub _draw { 2751sub _draw {
2502 my ($self) = @_; 2752 my ($self) = @_;
2503 2753
2504 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
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2766
2507 # TODO animation
2508 if ($tex) { 2767 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2768 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2770 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2514 } 2773 }
2515} 2774}
2516 2775
2517############################################################################# 2776sub DESTROY {
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_; 2777 my ($self) = @_;
2525 2778
2526 my $desc = 2779 $self->{timer}->cancel
2527 $item->{nrof} < 2 2780 if $self->{timer};
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530 2781
2531 $item->{flags} & Crossfire::Protocol::F_OPEN 2782 $self->SUPER::DESTROY;
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665} 2783}
2666 2784
2667############################################################################# 2785#############################################################################
2668 2786
2669package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
… …
2704 2822
2705# 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)
2706sub popup { 2824sub popup {
2707 my ($self, $ev) = @_; 2825 my ($self, $ev) = @_;
2708 2826
2709 $self->emit ("popdown"); 2827 $self->_emit ("popdown");
2710 2828
2711 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2830 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2714 2832
2715 $self->show; 2833 $self->show;
2716 $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);
2717} 2835}
2718 2836
2719sub mouse_motion { 2837sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2721 2839
… …
2729 2847
2730 if ($ev->{button} == $self->{button}) { 2848 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2849 undef $GRAB;
2732 $self->hide; 2850 $self->hide;
2733 2851
2734 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2853 $self->{hover}[1]->() if $self->{hover};
2736 } 2854 }
2737} 2855}
2738 2856
2739############################################################################# 2857#############################################################################
… …
2774 # TODO: doesn't handle markup well (read as: at all) 2892 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 2893 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 2894 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 2895 : $item->{text};
2778 2896
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 2897 for ($short) {
2782 s/^\s+//; 2898 s/^\s+//;
2783 s/\s+/ /g; 2899 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 2900 }
2787 2901
2788 new CFClient::UI::Label 2902 new CFClient::UI::Label
2789 markup => $short, 2903 markup => $short,
2790 tooltip => $item->{tooltip}, 2904 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 2905 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 2906 tooltip_width => 0.67,
2793 fontsize => $fontsize, 2907 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 2909 fg => $item->{fg},
2795 can_events => 1, 2910 can_events => 1,
2796 can_hover => 1 2911 can_hover => 1
2797 }; 2912 };
2798 } 2913 }
… …
2804sub add { 2919sub add {
2805 my ($self, $text, %arg) = @_; 2920 my ($self, $text, %arg) = @_;
2806 2921
2807 $text =~ s/^\s+//; 2922 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2923 $text =~ s/\s+$//;
2924
2925 return unless $text;
2809 2926
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2927 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2928
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2930
… …
2835 } 2952 }
2836 2953
2837 $self->reorder; 2954 $self->reorder;
2838} 2955}
2839 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
2840############################################################################# 2967#############################################################################
2841 2968
2842package CFClient::UI::Root; 2969package CFClient::UI::Inventory;
2843 2970
2844our @ISA = CFClient::UI::Container::; 2971our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 2972
2848sub new { 2973sub new {
2849 my $class = shift; 2974 my $class = shift;
2850 2975
2851 $class->SUPER::new ( 2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2852 @_, 2978 @_,
2853 ) 2979 );
2854}
2855 2980
2856sub 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 {
2857 my ($self, $x, $y, $w, $h) = @_; 3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2858 3130
2859 $self->{w} = $w; 3131 $self->clear_command_list;
2860 $self->{h} = $h; 3132 $self->{recording} = 0;
2861} 3133 $self->{rec_btn}->set_text ("start recording");
2862 3134
2863sub 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 {
2864 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}
2865 3153
2866 $self->size_allocate ($self->{w}, $self->{h}) 3154sub update_binding_widgets {
2867 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
2868} 3277}
2869 3278
2870sub size_request { 3279sub size_request {
2871 my ($self) = @_; 3280 my ($self) = @_;
2872 3281
2873 ($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
2874} 3297}
2875 3298
2876sub size_allocate { 3299sub size_allocate {
2877 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2878 3301
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885 for my $child ($self->children) { 3302 for my $child ($self->children) {
2886 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)};
2887 3304
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3305 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3306 $Y = $child->{force_y} if exists $child->{force_y};
2890 3307
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3308 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3309 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3310
2897 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
2898 } 3312 }
2899} 3313}
2900 3314
… …
2911} 3325}
2912 3326
2913sub update { 3327sub update {
2914 my ($self) = @_; 3328 my ($self) = @_;
2915 3329
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3330 $::WANT_REFRESH++;
2918} 3331}
2919 3332
2920sub add { 3333sub add {
2921 my ($self, @children) = @_; 3334 my ($self, @children) = @_;
2922 3335
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3336 $_->{is_toplevel} = 1
2925 3337 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3338
2931 $self->SUPER::add (@children); 3339 $self->SUPER::add (@children);
3340}
3341
3342sub remove {
3343 my ($self, @children) = @_;
3344
3345 $self->SUPER::remove (@children);
3346
3347 delete $self->{is_toplevel}
3348 for @children;
3349
3350 while (@children) {
3351 my $w = pop @children;
3352 push @children, $w->children;
3353 $w->set_invisible;
3354 }
2932} 3355}
2933 3356
2934sub on_refresh { 3357sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2936 3359
… …
2949 while ($self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2950 $_->() 3373 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
2952 } 3375 }
2953 3376
2954 if ($self->{check_size}) { 3377 if ($self->{realloc}) {
2955 my @queue = ([], []); 3378 my %queue;
3379 my @queue;
3380 my $widget;
2956 3381
2957 for (;;) { 3382 outer:
2958 if ($self->{check_size}) { 3383 while () {
2959 # heuristic: check containers last 3384 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3385 for $widget (values %$realloc) {
2961 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 }
2962 } 3392 }
2963 3393
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3394 while () {
3395 @queue or last outer;
2965 3396
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3397 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3398 and last;
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973 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}) {
2974 $widget->{req_w} = $w; 3415 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3416 $widget->{req_h} = $h;
2976 3417
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3418 $self->{size_alloc}{$widget+0} = $widget;
2978 3419
2979 $widget->{parent}->check_size
2980 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 }
2981 } 3427 }
3428
3429 delete $self->{realloc}{$widget+0};
2982 } 3430 }
2983 } 3431 }
2984 3432
2985 while ($self->{size_alloc}) { 3433 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 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)};
2988 3441
2989 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
2991 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
2992 $widget->{w} = $w; 3452 $widget->{w} = $w;
2993 $widget->{h} = $h; 3453 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3454
2995 $widget->emit (size_allocate => $w, $h); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
2996 } 3457 }
2997 } 3458 }
2998 3459
2999 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
3000 $_->() 3461 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
3002 } 3463 }
3003 3464
3465
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
3007 3469
3008 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3471 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3474 glLoadIdentity;
3013 3475
3014 $self->_draw; 3476 $self->_draw;
3015} 3477}
… …
3017############################################################################# 3479#############################################################################
3018 3480
3019package CFClient::UI; 3481package CFClient::UI;
3020 3482
3021$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3485
30241 34861
3025 3487

Diff Legend

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