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.267 by root, Thu Jun 1 04:10:29 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;
347} 453}
348 454
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
353sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
354 528
355sub draw { 529sub draw {
356 my ($self) = @_; 530 my ($self) = @_;
357 531
358 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
359 541
360 glPushMatrix; 542 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw; 544 $self->_draw;
363 glPopMatrix; 545 glPopMatrix;
… …
375 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
376 glEnd; 558 glEnd;
377 glDisable GL_BLEND; 559 glDisable GL_BLEND;
378 } 560 }
379 561
380 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
381 glPushMatrix; 563 glPushMatrix;
382 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 567 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
389 glEnd; 571 glEnd;
390 glPopMatrix; 572 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 574 }
393} 575}
394 576
395sub _draw { 577sub _draw {
396 my ($self) = @_; 578 my ($self) = @_;
397 579
398 warn "no draw defined for $self\n"; 580 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} 581}
448 582
449sub DESTROY { 583sub DESTROY {
450 my ($self) = @_; 584 my ($self) = @_;
451 585
… …
509 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
511} 645}
512 646
513sub size_request { 647sub size_request {
514 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
515} 651}
516 652
517sub draw { } 653sub draw { }
518 654
519############################################################################# 655#############################################################################
… …
548 $self->{children} = [ 684 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
551 ]; 687 ];
552 688
553 $self->check_size (1); 689 $self->realloc;
554 $self->update;
555} 690}
556 691
557sub children { 692sub children {
558 @{ $_[0]{children} } 693 @{ $_[0]{children} }
559} 694}
… …
564 delete $child->{parent}; 699 delete $child->{parent};
565 $child->hide; 700 $child->hide;
566 701
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 703
569 $self->check_size; 704 $self->realloc;
570 $self->update;
571} 705}
572 706
573sub clear { 707sub clear {
574 my ($self) = @_; 708 my ($self) = @_;
575 709
… …
579 for (@$children) { 713 for (@$children) {
580 delete $_->{parent}; 714 delete $_->{parent};
581 $_->hide; 715 $_->hide;
582 } 716 }
583 717
584 $self->check_size; 718 $self->realloc;
585 $self->update;
586} 719}
587 720
588sub find_widget { 721sub find_widget {
589 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
590 723
… …
677 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 811 $self->update;
679} 812}
680 813
681sub _render { 814sub _render {
815 my ($self) = @_;
816
682 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
683} 818}
684 819
685sub render_child { 820sub render_child {
686 my ($self) = @_; 821 my ($self) = @_;
687 822
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
691 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
692 $self->_render; 834 $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 }; 835 };
701} 836}
702 837
703sub _draw { 838sub _draw {
704 my ($self) = @_; 839 my ($self) = @_;
705 840
706 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
707 842
708 my $tex = $self->{texture} 843 my $tex = $self->{texture}
709 or return; 844 or return;
710 845
711 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 848 glColor 1, 1, 1, 1;
714 849
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 851
717 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
718} 853}
… …
721 856
722package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
723 858
724our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
725 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
726sub size_request { 871sub size_request {
727 my ($self) = @_; 872 my ($self) = @_;
728 873
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 875
732 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
733} 880}
734 881
735sub size_allocate { 882sub size_allocate {
736 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
737 884
885 my $child = $self->child;
886
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889
890 $self->child->configure (0, 0, $w, $h);
738 $self->update; 891 $self->update;
739} 892}
740 893
741sub set_offset { 894sub set_offset {
742 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
776} 929}
777 930
778sub _render { 931sub _render {
779 my ($self) = @_; 932 my ($self) = @_;
780 933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 938
783 $self->SUPER::_render; 939 $self->SUPER::_render;
784} 940}
785 941
… …
793 my $class = shift; 949 my $class = shift;
794 950
795 my $self; 951 my $self;
796 952
797 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
798 vertical => 1, 954 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 956 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
802 }, 958 },
803 ; 959 ;
804 960
805 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 962 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 963 slider => $slider,
808 @_, 964 @_,
809 ); 965 );
810 966
811 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 968 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
814 970
815 $self 971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 991}
817 992
818#TODO# update range on size_allocate depending on child 993#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 994# update viewport offset on scroll
820 995
… …
864 1039
865our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
866 1041
867use CFClient::OpenGL; 1042use CFClient::OpenGL;
868 1043
869my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 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); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1051
873sub new { 1052sub new {
874 my $class = shift; 1053 my $class = shift;
875 1054
876 # TODO: user_x, user_y, overwrite moveto?
877
878 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1058 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
884 @_ 1062 @_
885 ); 1063 );
886 1064
887 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 1066 align => 0,
… …
941 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
942 1120
943 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
945 1123
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1129 };
951 1130
952 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1135 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
958 1137
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
960 1139
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1141 };
964 } 1142 }
965} 1143}
966 1144
967sub button_up { 1145sub button_up {
… …
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1165
988 my $border = $self->border; 1166 my $border = $self->border;
989 1167
990 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1173
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
998 1176
999 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1180 $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); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1182 }
1010 1183
1011 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
1012 1185
… …
1028sub new { 1201sub new {
1029 my $class = shift; 1202 my $class = shift;
1030 1203
1031 $class->SUPER::new ( 1204 $class->SUPER::new (
1032 col_expand => [], 1205 col_expand => [],
1033 @_ 1206 @_,
1034 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1212}
1036 1213
1037sub add { 1214sub add {
1038 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1039 1216
1040 $child->set_parent ($self); 1217 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1042 1219
1043 $child->check_size; 1220 $self->realloc;
1044} 1221}
1045 1222
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1224sub clear {
1052 my ($self) = @_; 1225 my ($self) = @_;
1053 1226
1054 my @children = $self->children; 1227 my @children = $self->children;
1055 delete $self->{children}; 1228 delete $self->{children};
… …
1057 for (@children) { 1230 for (@children) {
1058 delete $_->{parent}; 1231 delete $_->{parent};
1059 $_->hide; 1232 $_->hide;
1060 } 1233 }
1061 1234
1062 $self->update; 1235 $self->realloc;
1063} 1236}
1064 1237
1065sub get_wh { 1238sub get_wh {
1066 my ($self) = @_; 1239 my ($self) = @_;
1067 1240
… …
1098sub size_allocate { 1271sub size_allocate {
1099 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1100 1273
1101 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1102 1275
1103 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1105 1278
1106 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1336 }
1164} 1337}
1165 1338
1166############################################################################# 1339#############################################################################
1167 1340
1168package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1342
1172our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1173 1344
1174sub size_request { 1345sub size_request {
1175 my ($self) = @_; 1346 my ($self) = @_;
1176 1347
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1178 1349 ? (
1179 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1352 )
1182 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1183} 1357}
1184 1358
1185sub size_allocate { 1359sub size_allocate {
1186 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1187 1361
1188 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1363 my $children = $self->{children};
1191 1364
1192 my @h = map $_->{req_w}, @$children; 1365 my @req;
1193 1366
1194 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1195 1368 @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 { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1382 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 } 1383 }
1210 } 1384 }
1211 1385
1212 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1213 1387
1214 my $y = 0; 1388 my $pos = 0;
1215 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1392
1220 $y += $h; 1393 $pos += $alloc;
1221 } 1394 }
1222 1395
1223 1 1396 1
1224} 1397}
1225 1398
1226############################################################################# 1399#############################################################################
1227 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1228package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1229 1417
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1233 1419
1234sub size_request { 1420sub new {
1235 my ($self) = @_; 1421 my $class = shift;
1236 1422
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1238 1424 vertical => 1,
1239 ( 1425 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1426 )
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} 1427}
1283 1428
1284############################################################################# 1429#############################################################################
1285 1430
1286package CFClient::UI::Label; 1431package CFClient::UI::Label;
… …
1297 #bg => none 1442 #bg => none
1298 #active_bg => none 1443 #active_bg => none
1299 #font => default_font 1444 #font => default_font
1300 #text => initial text 1445 #text => initial text
1301 #markup => initial narkup 1446 #markup => initial narkup
1447 #max_w => maximum pixel width
1448 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1303 fontsize => 1, 1450 fontsize => 1,
1304 align => -1, 1451 align => -1,
1305 valign => -1, 1452 valign => -1,
1306 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1307 can_events => 0, 1455 can_events => 0,
1308 %arg 1456 %arg
1309 ); 1457 );
1310 1458
1311 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1348 1496
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1351 1499
1500 $self->realloc;
1352 $self->update; 1501 $self->update;
1353 $self->check_size;
1354} 1502}
1355 1503
1356sub set_markup { 1504sub set_markup {
1357 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1358 1506
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1511
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1366 1514
1515 $self->realloc;
1367 $self->update; 1516 $self->update;
1368 $self->check_size;
1369} 1517}
1370 1518
1371sub size_request { 1519sub size_request {
1372 my ($self) = @_; 1520 my ($self) = @_;
1373 1521
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1522 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1523 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1527
1378 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1379 1529
1380 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
… …
1385 1535
1386 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1388 } 1538 }
1389 1539
1390 ( 1540 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1541}
1395 1542
1396sub size_allocate { 1543sub size_allocate {
1397 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1398 1545
1399 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1548}
1401 1549
1402sub set_fontsize { 1550sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1404 1552
1405 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1554 delete $self->{texture};
1407 1555
1408 $self->update; 1556 $self->realloc;
1409 $self->check_size;
1410} 1557}
1411 1558
1412sub _draw { 1559sub _draw {
1413 my ($self) = @_; 1560 my ($self) = @_;
1414 1561
… …
1416 1563
1417 my $tex = $self->{texture} ||= do { 1564 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1565 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1566 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1567 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1571
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1573
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1576 : ($self->{w} - $tex->{w}) * 0.5);
1428 1577
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1580 : ($self->{h} - $tex->{h}) * 0.5);
1432 1581
1433 $tex 1582 $tex
1434 }; 1583 };
1435 1584
… …
1464 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1465 can_hover => 1, 1614 can_hover => 1,
1466 can_focus => 1, 1615 can_focus => 1,
1467 valign => 0, 1616 valign => 0,
1468 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1469 @_ 1619 @_
1470 ) 1620 )
1471} 1621}
1472 1622
1473sub _set_text { 1623sub _set_text {
… …
1483 $self->{text} = $text; 1633 $self->{text} = $text;
1484 1634
1485 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1487 1637
1488 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1489} 1639}
1490 1640
1491sub set_text { 1641sub set_text {
1492 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1493 1643
1494 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1645 $self->_set_text ($text);
1496 $self->update; 1646
1497 $self->check_size; 1647 $self->realloc;
1498} 1648}
1499 1649
1500sub get_text { 1650sub get_text {
1501 $_[0]{text} 1651 $_[0]{text}
1502} 1652}
… …
1505 my ($self) = @_; 1655 my ($self) = @_;
1506 1656
1507 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1508 1658
1509 ($w + 1, $h) # add 1 for cursor 1659 ($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} 1660}
1517 1661
1518sub key_down { 1662sub key_down {
1519 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1520 1664
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1683 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1684 $self->_emit ('escape');
1541 } elsif ($uni) { 1685 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1687 }
1544 1688
1545 $self->_set_text ($text); 1689 $self->_set_text ($text);
1546 $self->update; 1690
1547 $self->check_size; 1691 $self->realloc;
1548} 1692}
1549 1693
1550sub focus_in { 1694sub focus_in {
1551 my ($self) = @_; 1695 my ($self) = @_;
1552 1696
… …
1632 if ($sym == 13) { 1776 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1638 $self->update; 1782 $self->update;
1639 1783
1640 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1679 1823
1680sub new { 1824sub new {
1681 my $class = shift; 1825 my $class = shift;
1682 1826
1683 $class->SUPER::new ( 1827 $class->SUPER::new (
1684 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1685 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1687 can_hover => 1, 1832 can_hover => 1,
1688 align => 0, 1833 align => 0,
1689 valign => 0, 1834 valign => 0,
1690 can_events => 1, 1835 can_events => 1,
1691 @_ 1836 @_
1692 ) 1837 )
1693} 1838}
1694 1839
1840sub activate { }
1841
1695sub button_up { 1842sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1697 1844
1845 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1848}
1703 1849
1704sub _draw { 1850sub _draw {
1705 my ($self) = @_; 1851 my ($self) = @_;
1706 1852
… …
1735 1881
1736sub new { 1882sub new {
1737 my $class = shift; 1883 my $class = shift;
1738 1884
1739 $class->SUPER::new ( 1885 $class->SUPER::new (
1740 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1741 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1890 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1891 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1892 state => 0,
… …
1749} 1896}
1750 1897
1751sub size_request { 1898sub size_request {
1752 my ($self) = @_; 1899 my ($self) = @_;
1753 1900
1754 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1755} 1902}
1756 1903
1757sub button_down { 1904sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1759 1906
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1764 } 1911 }
1765} 1912}
1766 1913
1767sub _draw { 1914sub _draw {
1768 my ($self) = @_; 1915 my ($self) = @_;
1769 1916
1770 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1771 1918
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1920
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1924
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1926
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1928
… …
2043 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2195 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2196 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2051 vertical => 0, 2200 vertical => 0,
2052 can_hover => 1, 2201 can_hover => 1,
2053 inner_pad => .05, 2202 inner_pad => 0.02,
2054 @_ 2203 @_
2055 ); 2204 );
2056 2205
2057 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2058 $self->update; 2207 $self->update;
2059 2208
2060 $self 2209 $self
2061} 2210}
2062 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2063sub set_value { 2223sub set_value {
2064 my ($self, $value) = @_; 2224 my ($self, $value) = @_;
2065 2225
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2227
2068 $hi = $lo + 1 if $hi <= $lo; 2228 $hi = $lo + 1 if $hi <= $lo;
2069 2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2070 $value = $lo if $value < $lo; 2232 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2233 $value = $hi - $page if $value > $hi - $page;
2072 2234
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2236 if $unit;
2075 2237
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2239
2080 if ($value != $old_value) { 2240 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2241 $self->_emit (changed => $value);
2082 $self->update; 2242 $self->update;
2083 } 2243 }
2084} 2244}
2085 2245
2086sub size_request { 2246sub size_request {
2087 my ($self) = @_; 2247 my ($self) = @_;
2088 2248
2089 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2250}
2094 2251
2095sub button_down { 2252sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2097 2254
2098 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
2099 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
2100} 2260}
2101 2261
2102sub mouse_motion { 2262sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2267
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2269
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2271
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2273 }
2114} 2274}
2115 2275
2116sub update { 2276sub update {
2117 my ($self) = @_; 2277 my ($self) = @_;
2118 2278
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2280 $self->set_value ($self->{range}[0]);
2121 2281
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2123 2284
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2286
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2289
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2290 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2291 $value = $value * $self->{scale} + $self->{offset};
2130 2292
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; 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2294 $self->{knob_w} = $knob_w;
2138 }); 2295 });
2139 2296
2140 $self->SUPER::update; 2297 $self->SUPER::update;
2141} 2298}
2142 2299
… …
2148 glScale $self->{w}, $self->{h}; 2305 glScale $self->{w}, $self->{h};
2149 2306
2150 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
2152 2309
2310 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2312 }
2156 2313
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2316
… …
2166 # draw handle 2323 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2325
2169 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2170} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
2171 2369
2172############################################################################# 2370#############################################################################
2173 2371
2174package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2175 2373
… …
2205 2403
2206 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2405 $self->reflow;
2208} 2406}
2209 2407
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 { 2408sub size_allocate {
2230 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2231 2410
2232 $self->SUPER::size_allocate ($w, $h); 2411 $self->SUPER::size_allocate ($w, $h);
2233 2412
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2416
2238 $self->reflow; 2417 $self->reflow;
2239} 2418}
2240 2419
2420sub text_size {
2421 my ($self, $text, $indent) = @_;
2422
2423 my $layout = $self->{layout};
2424
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2427 $layout->set_markup ($text);
2428
2429 $layout->size
2430}
2431
2432sub reflow {
2433 my ($self) = @_;
2434
2435 $self->{need_reflow}++;
2436 $self->update;
2437}
2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
2241sub add_paragraph { 2454sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2243 2456
2244 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2245 2458 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2249 2462
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2464}
2255 2465
2256sub update { 2466sub update {
2257 my ($self) = @_; 2467 my ($self) = @_;
2258 2468
… …
2261 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2262 2472
2263 delete $self->{texture}; 2473 delete $self->{texture};
2264 2474
2265 $ROOT->on_post_alloc ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2266 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2479 my $height = 0;
2268 2480
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2270 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2271 2496
2272 $self->{height} = $height; 2497 $self->{height} = $height;
2273 2498
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2500
2276 delete $self->{texture}; 2501 delete $self->{texture};
2277 } 2502 }
2278 2503
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2282 2507
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]; 2508 my $top = int $self->{children}[1]{range}[0];
2287 2509
2288 my $y0 = $top; 2510 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2511 my $y1 = $top + $H;
2290 2512
2291 my $y = 0; 2513 my $y = 0;
2292 2514
2293 my $layout = $self->{layout}; 2515 my $layout = $self->{layout};
2294 2516
2295 $layout->set_font ($self->{font}) if $self->{font}; 2517 $layout->set_font ($self->{font}) if $self->{font};
2296 2518
2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2522
2297 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2524 my $h = $par->[1];
2299 2525
2300 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2303 2530
2304 my ($W, $H) = $layout->size; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2532
2533 glRasterPos $par->[3], $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2535 }
2307 2536
2308 $y += $h; 2537 $y += $h;
2309 } 2538 }
2310 2539
2311 glDisable GL_TEXTURE_2D; 2540 glDisable GL_BLEND;
2312 }; 2541 };
2313 }); 2542 });
2314} 2543}
2315 2544
2316sub _draw { 2545sub _draw {
2317 my ($self) = @_; 2546 my ($self) = @_;
2318 2547
2319 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2550 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2324 2553
2325 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2326 2555
2327} 2556}
… …
2376 2605
2377sub new { 2606sub new {
2378 my $class = shift; 2607 my $class = shift;
2379 2608
2380 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2381 state => 0, 2610 state => 0,
2382 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2383 @_ 2612 @_
2384 ); 2613 );
2385 2614
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2615 $self
2392} 2616}
2393 2617
2394sub toggle_flopper { 2618sub toggle_flopper {
2395 my ($self) = @_; 2619 my ($self) = @_;
2396 2620
2397 # TODO: use animation 2621 $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} 2622}
2409 2623
2410############################################################################# 2624#############################################################################
2411 2625
2412package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2425} 2639}
2426 2640
2427sub set_tooltip_from { 2641sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2429 2643
2644 my $tooltip = $widget->{tooltip};
2645
2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2430 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2656 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2658 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2660 );
2437} 2661}
2438 2662
2439sub size_request { 2663sub size_request {
2440 my ($self) = @_; 2664 my ($self) = @_;
… …
2446 2670
2447sub size_allocate { 2671sub size_allocate {
2448 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2449 2673
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2451} 2693}
2452 2694
2453sub _draw { 2695sub _draw {
2454 my ($self) = @_; 2696 my ($self) = @_;
2455 2697
… …
2472 glVertex $w, $h; 2714 glVertex $w, $h;
2473 glVertex $w, 0; 2715 glVertex $w, 0;
2474 glEnd; 2716 glEnd;
2475 2717
2476 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2477 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2478} 2721}
2479 2722
2480############################################################################# 2723#############################################################################
2481 2724
… …
2486use CFClient::OpenGL; 2729use CFClient::OpenGL;
2487 2730
2488sub new { 2731sub new {
2489 my $class = shift; 2732 my $class = shift;
2490 2733
2491 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2492 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2493 @_, 2737 @_,
2494 ) 2738 );
2739
2740 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self);
2742
2743 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1,
2746 interval => $self->{animspeed},
2747 cb => sub {
2748 ++$widget->{frame};
2749 $widget->update;
2750 },
2751 );
2752 }
2753
2754 $self
2495} 2755}
2496 2756
2497sub size_request { 2757sub size_request {
2498 (32, 8) 2758 (32, 8)
2499} 2759}
2500 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2501sub _draw { 2769sub _draw {
2502 my ($self) = @_; 2770 my ($self) = @_;
2503 2771
2504 return unless $::CONN;#d# manage and cache textures differently 2772 return unless $::CONN;
2773
2774 my $face;
2775
2776 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}];
2778
2779 $face = $anim->[ $self->{frame} % @$anim ]
2780 if $anim && @$anim;
2781 }
2782
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2784
2507 # TODO animation
2508 if ($tex) { 2785 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2514 } 2791 }
2515} 2792}
2516 2793
2517############################################################################# 2794sub DESTROY {
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_; 2795 my ($self) = @_;
2525 2796
2526 my $desc = 2797 $self->{timer}->cancel
2527 $item->{nrof} < 2 2798 if $self->{timer};
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530 2799
2531 $item->{flags} & Crossfire::Protocol::F_OPEN 2800 $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} 2801}
2666 2802
2667############################################################################# 2803#############################################################################
2668 2804
2669package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2704 2840
2705# popup given the event (must be a mouse button down event currently) 2841# popup given the event (must be a mouse button down event currently)
2706sub popup { 2842sub popup {
2707 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2708 2844
2709 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2710 2846
2711 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2848 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2714 2850
2715 $self->show; 2851 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717} 2853}
2718 2854
2719sub mouse_motion { 2855sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2721 2857
… …
2729 2865
2730 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2867 undef $GRAB;
2732 $self->hide; 2868 $self->hide;
2733 2869
2734 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2736 } 2872 }
2737} 2873}
2738 2874
2739############################################################################# 2875#############################################################################
… …
2774 # TODO: doesn't handle markup well (read as: at all) 2910 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 2911 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 2912 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 2913 : $item->{text};
2778 2914
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 2915 for ($short) {
2782 s/^\s+//; 2916 s/^\s+//;
2783 s/\s+/ /g; 2917 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 2918 }
2787 2919
2788 new CFClient::UI::Label 2920 new CFClient::UI::Label
2789 markup => $short, 2921 markup => $short,
2790 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2793 fontsize => $fontsize, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 2927 fg => $item->{fg},
2795 can_events => 1, 2928 can_events => 1,
2796 can_hover => 1 2929 can_hover => 1
2797 }; 2930 };
2798 } 2931 }
… …
2804sub add { 2937sub add {
2805 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2806 2939
2807 $text =~ s/^\s+//; 2940 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2809 2944
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2946
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2948
… …
2835 } 2970 }
2836 2971
2837 $self->reorder; 2972 $self->reorder;
2838} 2973}
2839 2974
2975sub reconfigure {
2976 my ($self) = @_;
2977
2978 delete $_->{label}
2979 for values %{ $self->{item} || {} };
2980
2981 $self->reorder;
2982 $self->SUPER::reconfigure;
2983}
2984
2840############################################################################# 2985#############################################################################
2841 2986
2842package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
2843 2988
2844our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 2990
2848sub new { 2991sub new {
2849 my $class = shift; 2992 my $class = shift;
2850 2993
2851 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2852 @_, 2996 @_,
2853 ) 2997 );
2854}
2855 2998
2856sub configure { 2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
2857 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2858 3148
2859 $self->{w} = $w; 3149 $self->clear_command_list;
2860 $self->{h} = $h; 3150 $self->{recording} = 0;
2861} 3151 $self->{rec_btn}->set_text ("start recording");
2862 3152
2863sub check_size { 3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
2864 my ($self) = @_; 3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
2865 3171
2866 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2867 if $self->{w}; 3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::Root;
3279
3280our @ISA = CFClient::UI::Container::;
3281
3282use CFClient::OpenGL;
3283
3284sub new {
3285 my $class = shift;
3286
3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2868} 3295}
2869 3296
2870sub size_request { 3297sub size_request {
2871 my ($self) = @_; 3298 my ($self) = @_;
2872 3299
2873 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
2874} 3315}
2875 3316
2876sub size_allocate { 3317sub size_allocate {
2877 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2878 3319
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) { 3320 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3322
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3323 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
2890 3325
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3326 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3327 $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 3328
2897 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2898 } 3330 }
2899} 3331}
2900 3332
… …
2911} 3343}
2912 3344
2913sub update { 3345sub update {
2914 my ($self) = @_; 3346 my ($self) = @_;
2915 3347
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
2918} 3349}
2919 3350
2920sub add { 3351sub add {
2921 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
2922 3353
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3354 $_->{is_toplevel} = 1
2925 3355 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3356
2931 $self->SUPER::add (@children); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3367
3368 while (@children) {
3369 my $w = pop @children;
3370 push @children, $w->children;
3371 $w->set_invisible;
3372 }
2932} 3373}
2933 3374
2934sub on_refresh { 3375sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2936 3377
… …
2949 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2950 $_->() 3391 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
2952 } 3393 }
2953 3394
2954 if ($self->{check_size}) { 3395 if ($self->{realloc}) {
2955 my @queue = ([], []); 3396 my %queue;
3397 my @queue;
3398 my $widget;
2956 3399
2957 for (;;) { 3400 outer:
2958 if ($self->{check_size}) { 3401 while () {
2959 # heuristic: check containers last 3402 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3403 for $widget (values %$realloc) {
2961 for values %{delete $self->{check_size}} 3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
2962 } 3410 }
2963 3411
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3412 while () {
3413 @queue or last outer;
2965 3414
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3415 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3416 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 3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
2974 $widget->{req_w} = $w; 3433 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3434 $widget->{req_h} = $h;
2976 3435
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3436 $self->{size_alloc}{$widget+0} = $widget;
2978 3437
2979 $widget->{parent}->check_size
2980 if $widget->{parent}; 3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
2981 } 3445 }
3446
3447 delete $self->{realloc}{$widget+0};
2982 } 3448 }
2983 } 3449 }
2984 3450
2985 while ($self->{size_alloc}) { 3451 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 my ($widget, $w, $h) = @$_; 3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2988 3459
2989 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
2991 3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
2992 $widget->{w} = $w; 3470 $widget->{w} = $w;
2993 $widget->{h} = $h; 3471 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3472
2995 $widget->emit (size_allocate => $w, $h); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
2996 } 3475 }
2997 } 3476 }
2998 3477
2999 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
3000 $_->() 3479 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
3002 } 3481 }
3003 3482
3483
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
3007 3487
3008 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3489 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3492 glLoadIdentity;
3013 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
3014 $self->_draw; 3501 $self->_draw;
3015} 3502}
3016 3503
3017############################################################################# 3504#############################################################################
3018 3505
3019package CFClient::UI; 3506package CFClient::UI;
3020 3507
3021$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3510
30241 35111
3025 3512

Diff Legend

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