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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $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 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
67 87
88 warn "button down $ev->{button}\n";#d#
89
68 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
69 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
70 92
71 $GRAB = $widget; 93 $GRAB = $widget;
72 $GRAB->update if $GRAB; 94 $GRAB->update if $GRAB;
73 95
74 check_tooltip; 96 $TOOLTIP_WATCHER->cb->();
75 } 97 }
76 98
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 99 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 100
79 if ($GRAB) { 101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 102 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 103}
84 104
85sub feed_sdl_button_up_event { 105sub feed_sdl_button_up_event {
86 my ($ev) = @_; 106 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 107 my ($x, $y) = ($ev->{x}, $ev->{y});
88 108
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 109 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 110
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 111 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 112
93 if ($GRAB) { 113 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 114 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 115
98 if (!$BUTTON_STATE) { 116 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 117 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 118 $grab->update if $grab;
101 $GRAB->update if $GRAB; 119 $GRAB->update if $GRAB;
102 120
103 check_tooltip; 121 $TOOLTIP_WATCHER->cb->();
104 } 122 }
105} 123}
106 124
107sub feed_sdl_motion_event { 125sub feed_sdl_motion_event {
108 my ($ev) = @_; 126 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 132 my $hover = $HOVER; $HOVER = $widget;
115 133
116 $hover->update if $hover && $hover->{can_hover}; 134 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 135 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 136
119 check_tooltip; 137 $TOOLTIP_WATCHER->start;
120 } 138 }
121 139
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 141 if $HOVER;
126} 142}
127 143
128# convert position array to integers 144# convert position array to integers
129sub harmonize { 145sub harmonize {
130 my ($vals) = @_; 146 my ($vals) = @_;
… …
144 160
145 $_->update 161 $_->update
146 for @widgets; 162 for @widgets;
147} 163}
148 164
165sub reconfigure_widgets {
166 # make a copy, otherwise C<for> complains about freed values.
167 my @widgets = values %WIDGET;
168
169 $_->reconfigure
170 for @widgets;
171}
172
149# call when resolution changes etc. 173# call when resolution changes etc.
150sub rescale_widgets { 174sub rescale_widgets {
151 my ($sx, $sy) = @_; 175 my ($sx, $sy) = @_;
152 176
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 177 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 178 if ($widget->{is_toplevel}) {
179 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
181
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 182 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 183 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 184 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 185 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 186 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 187 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 188
189 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
190 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
191
166 } 192 }
167
168 $widget->reconfigure;
169 } 193 }
194
195 reconfigure_widgets;
170} 196}
171 197
172############################################################################# 198#############################################################################
173 199
174package CFClient::UI::Base; 200package CFClient::UI::Base;
… …
179 205
180sub new { 206sub new {
181 my $class = shift; 207 my $class = shift;
182 208
183 my $self = bless { 209 my $self = bless {
184 x => 0, 210 x => "center",
185 y => 0, 211 y => "center",
186 z => 0, 212 z => 0,
213 w => undef,
214 h => undef,
187 can_events => 1, 215 can_events => 1,
188 @_ 216 @_
189 }, $class; 217 }, $class;
190 218
219 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
220
191 for (keys %$self) { 221 for (keys %$self) {
192 if (/^connect_(.*)$/) { 222 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 223 $self->connect ($1 => delete $self->{$_});
194 } 224 }
195 } 225 }
196 226
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 227 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
228 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
229 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
230 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
231 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
232
233 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235
236 $self->show if $layout->{show};
237 }
198 238
199 $self 239 $self
200} 240}
201 241
202sub destroy { 242sub destroy {
… …
212 return if $self->{parent}; 252 return if $self->{parent};
213 253
214 $CFClient::UI::ROOT->add ($self); 254 $CFClient::UI::ROOT->add ($self);
215} 255}
216 256
217sub hide { 257sub set_visible {
218 my ($self) = @_; 258 my ($self) = @_;
259
260 return if $self->{visible};
261
262 $self->{root} = $self->{parent}{root};
263 $self->{visible} = $self->{parent}{visible} + 1;
264
265 $self->emit (visibility_change => 1);
266
267 $self->realloc if !exists $self->{req_w};
268
269 $_->set_visible for $self->children;
270}
271
272sub set_invisible {
273 my ($self) = @_;
274
275 return unless $self->{visible};
276
277 $_->set_invisible for $self->children;
278
279 delete $self->{visible};
280 delete $self->{root};
219 281
220 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
222 284
285 $CFClient::UI::TOOLTIP_WATCHER->cb->()
286 if $TOOLTIP->{owner} == $self;
287
288 $self->emit ("focus_out");
289 $self->emit (visibility_change => 0);
290}
291
292sub set_visibility {
293 my ($self, $visible) = @_;
294
295 return if $self->{visible} == $visible;
296
297 $visible ? $self->hide
298 : $self->show;
299}
300
301sub toggle_visibility {
302 my ($self) = @_;
303
304 $self->{visible}
305 ? $self->hide
306 : $self->show;
307}
308
309sub hide {
310 my ($self) = @_;
311
312 $self->set_invisible;
313
223 $self->{parent}->remove ($self) 314 $self->{parent}->remove ($self)
224 if $self->{parent}; 315 if $self->{parent};
225} 316}
226 317
227sub move { 318sub move_abs {
228 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
229 320
230 $self->{x} = int $x; 321 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
231 $self->{y} = int $y; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
232 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
233 324
234 $self->update; 325 $self->update;
235} 326}
236 327
237sub set_size { 328sub set_size {
238 my ($self, $w, $h) = @_; 329 my ($self, $w, $h) = @_;
239 330
240 $self->{user_w} = $w; 331 $self->{force_w} = $w;
241 $self->{user_h} = $h; 332 $self->{force_h} = $h;
242 333
243 $self->check_size; 334 $self->realloc;
244} 335}
245 336
246sub size_request { 337sub size_request {
247 require Carp; 338 require Carp;
248 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
249} 340}
250 341
342sub baseline_shift {
343 0
344}
345
251sub configure { 346sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
253 348
254 if ($self->{aspect}) { 349 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h);
351
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 352 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 353 $h = List::Util::min $h, int $w / $self->{aspect};
257 354
258 # use alignment to adjust x, y 355 # use alignment to adjust x, y
259 356
260 $x += int +($w - $w2) * 0.5; 357 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 358 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 359 }
265 360
266 if ($self->{x} != $x || $self->{y} != $y) { 361 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 362 $self->{x} = $x;
268 $self->{y} = $y; 363 $self->{y} = $y;
269 $self->update; 364 $self->update;
270 } 365 }
271 366
272 if ($self->{w} != $w || $self->{h} != $h) { 367 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 368 return unless $self->{visible};
274 }
275}
276 369
277sub size_allocate { 370 $self->{alloc_w} = $w;
278 # nothing to be done 371 $self->{alloc_h} = $h;
279}
280 372
281sub reconfigure { 373 $self->{root}{size_alloc}{$self+0} = $self;
282 my ($self) = @_; 374 }
283
284 $self->check_size (1);
285 $self->update;
286} 375}
287 376
288sub children { 377sub children {
378 # nop
379}
380
381sub visible_children {
382 $_[0]->children
289} 383}
290 384
291sub set_max_size { 385sub set_max_size {
292 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
293 387
294 delete $self->{max_w}; $self->{max_w} = $w if $w; 388 $self->{max_w} = int $w if defined $w;
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 389 $self->{max_h} = int $h if defined $h;
390
391 $self->realloc;
296} 392}
297 393
298sub set_tooltip { 394sub set_tooltip {
299 my ($self, $tooltip) = @_; 395 my ($self, $tooltip) = @_;
300 396
397 $tooltip =~ s/^\s+//;
398 $tooltip =~ s/\s+$//;
399
400 return if $self->{tooltip} eq $tooltip;
401
301 $self->{tooltip} = $tooltip; 402 $self->{tooltip} = $tooltip;
302 403
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 404 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 405 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 406 $CFClient::UI::TOOLTIP_WATCHER->cb->();
306 } 407 }
307} 408}
308 409
309# translate global coordinates to local coordinate system 410# translate global coordinates to local coordinate system
310sub coord2local { 411sub coord2local {
… …
318 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
319 420
320 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
321} 422}
322 423
323sub focus_in { 424sub invoke_focus_in {
324 my ($self) = @_; 425 my ($self) = @_;
325 426
326 return if $FOCUS == $self; 427 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
328 429
329 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
330 431
331 $self->emit (focus_in => $focus); 432 $self->update;
332 433
333 $focus->update if $focus; 434 0
334 $FOCUS->update;
335} 435}
336 436
337sub focus_out { 437sub invoke_focus_out {
338 my ($self) = @_; 438 my ($self) = @_;
339 439
340 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
341 441
342 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
343 443
344 $self->emit (focus_out => $focus); 444 $self->update;
345 445
346 $focus->update if $focus; #? 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
347} 447 unless $FOCUS;
348 448
449 0
450}
451
452sub grab_focus {
453 my ($self) = @_;
454
455 $FOCUS->emit ("focus_out") if $FOCUS;
456 $self->emit ("focus_in");
457}
458
349sub mouse_motion { } 459sub invoke_mouse_motion { 0 }
350sub button_up { } 460sub invoke_button_up { 0 }
351sub key_down { } 461sub invoke_key_down { 0 }
352sub key_up { } 462sub invoke_key_up { 0 }
353 463
354sub button_down { 464sub invoke_button_down {
355 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
356 466
357 $self->focus_in; 467 $self->grab_focus;
358}
359 468
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 469 warn "button down $ev->{button} $x $y\n";#d#
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 470
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 471 0
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 472}
364sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 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 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
487}
488
489sub find_widget {
490 my ($self, $x, $y) = @_;
491
492 return () unless $self->{can_events};
493
494 return $self
495 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
496 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
497
498 ()
499}
500
501sub set_parent {
502 my ($self, $parent) = @_;
503
504 Scalar::Util::weaken ($self->{parent} = $parent);
505 $self->set_visible if $parent->{visible};
506}
507
508sub realloc {
509 my ($self) = @_;
510
511 if ($self->{visible}) {
512 return if $self->{root}{realloc}{$self+0};
513
514 $self->{root}{realloc}{$self+0} = $self;
515 $self->{root}->update;
516 } else {
517 delete $self->{req_w};
518 delete $self->{req_h};
519 }
520}
521
522sub update {
523 my ($self) = @_;
524
525 $self->{parent}->update
526 if $self->{parent};
527}
528
529sub reconfigure {
530 my ($self) = @_;
531
532 $self->realloc;
533 $self->update;
534}
535
536# using global variables seems a bit hacky, but passing through all drawing
537# functions seems pointless.
538our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
365 539
366sub draw { 540sub draw {
367 my ($self) = @_; 541 my ($self) = @_;
368 542
369 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
544
545 # update screen rectangle
546 local $draw_x = $draw_x + $self->{x};
547 local $draw_y = $draw_y + $self->{y};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
370 552
371 glPushMatrix; 553 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw;
374 glPopMatrix;
375 555
376 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
377 my ($x, $y) = @$self{qw(x y)};
378
379 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
380 glEnable GL_BLEND; 558 glEnable GL_BLEND;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
382 glBegin GL_QUADS; 560 glBegin GL_QUADS;
383 glVertex $x , $y;
384 glVertex $x + $self->{w}, $y;
385 glVertex $x + $self->{w}, $y + $self->{h};
386 glVertex $x , $y + $self->{h};
387 glEnd;
388 glDisable GL_BLEND;
389 }
390
391 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix;
393 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 561 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
400 glEnd; 565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
401 glPopMatrix; 579 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
404} 585}
405 586
406sub _draw { 587sub _draw {
407 my ($self) = @_; 588 my ($self) = @_;
408 589
409 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
410} 591}
411 592
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458}
459
460sub DESTROY { 593sub DESTROY {
461 my ($self) = @_; 594 my ($self) = @_;
462 595
596 return if CFClient::in_destruct;
597
463 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
464 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
465} 602}
466 603
467############################################################################# 604#############################################################################
468 605
469package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
494 631
495 if ($color && (@$color < 4 || $color->[3])) { 632 if ($color && (@$color < 4 || $color->[3])) {
496 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
497 634
498 glEnable GL_BLEND; 635 glEnable GL_BLEND;
499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
500 glColor @$color; 637 glColor_premultiply @$color;
501 638
502 glBegin GL_QUADS; 639 glBegin GL_QUADS;
503 glVertex 0 , 0; 640 glVertex 0 , 0;
504 glVertex 0 , $h; 641 glVertex 0 , $h;
505 glVertex $w, $h; 642 glVertex $w, $h;
… …
520 my ($class, %arg) = @_; 657 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 658 $class->SUPER::new (can_events => 0, %arg);
522} 659}
523 660
524sub size_request { 661sub size_request {
525 (0, 0) 662 my ($self) = @_;
663
664 ($self->{w} + 0, $self->{h} + 0)
526} 665}
527 666
528sub draw { } 667sub draw { }
529 668
530############################################################################# 669#############################################################################
… …
534our @ISA = CFClient::UI::Base::; 673our @ISA = CFClient::UI::Base::;
535 674
536sub new { 675sub new {
537 my ($class, %arg) = @_; 676 my ($class, %arg) = @_;
538 677
539 my $children = delete $arg{children} || []; 678 my $children = delete $arg{children};
540 679
541 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
542 children => [], 681 children => [],
543 can_events => 0, 682 can_events => 0,
544 %arg, 683 %arg,
545 ); 684 );
685
546 $self->add ($_) for @$children; 686 $self->add (@$children)
687 if $children;
547 688
548 $self 689 $self
549} 690}
550 691
551sub add { 692sub add {
… …
559 $self->{children} = [ 700 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 701 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 702 @{$self->{children}}, @widgets
562 ]; 703 ];
563 704
564 $self->check_size (1); 705 $self->realloc;
565 $self->update;
566} 706}
567 707
568sub children { 708sub children {
569 @{ $_[0]{children} } 709 @{ $_[0]{children} }
570} 710}
… …
575 delete $child->{parent}; 715 delete $child->{parent};
576 $child->hide; 716 $child->hide;
577 717
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 718 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 719
580 $self->check_size; 720 $self->realloc;
581 $self->update;
582} 721}
583 722
584sub clear { 723sub clear {
585 my ($self) = @_; 724 my ($self) = @_;
586 725
… …
590 for (@$children) { 729 for (@$children) {
591 delete $_->{parent}; 730 delete $_->{parent};
592 $_->hide; 731 $_->hide;
593 } 732 }
594 733
595 $self->check_size; 734 $self->realloc;
596 $self->update;
597} 735}
598 736
599sub find_widget { 737sub find_widget {
600 my ($self, $x, $y) = @_; 738 my ($self, $x, $y) = @_;
601 739
602 $x -= $self->{x}; 740 $x -= $self->{x};
603 $y -= $self->{y}; 741 $y -= $self->{y};
604 742
605 my $res; 743 my $res;
606 744
607 for (reverse @{ $self->{children} }) { 745 for (reverse $self->visible_children) {
608 $res = $_->find_widget ($x, $y) 746 $res = $_->find_widget ($x, $y)
609 and return $res; 747 and return $res;
610 } 748 }
611 749
612 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 750 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
633} 771}
634 772
635sub add { 773sub add {
636 my ($self, $child) = @_; 774 my ($self, $child) = @_;
637 775
638 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
639
640 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
641} 778}
642 779
643sub remove { 780sub remove {
644 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
653 790
654sub size_request { 791sub size_request {
655 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
656} 793}
657 794
658sub size_allocate { 795sub invoke_size_allocate {
659 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
660 797
661 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
662} 801}
663 802
664############################################################################# 803#############################################################################
804
805# back-buffered drawing area
665 806
666package CFClient::UI::Window; 807package CFClient::UI::Window;
667 808
668our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
669 810
… …
680 821
681 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
682 $self->SUPER::update; 823 $self->SUPER::update;
683} 824}
684 825
685sub size_allocate { 826sub invoke_size_allocate {
686 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
687 828
688 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
690} 832}
691 833
692sub _render { 834sub _render {
835 my ($self) = @_;
836
693 $_[0]{children}[0]->draw; 837 $self->{children}[0]->draw;
694} 838}
695 839
696sub render_child { 840sub render_child {
697 my ($self) = @_; 841 my ($self) = @_;
698 842
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 843 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 844 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 845 glClear GL_COLOR_BUFFER_BIT;
702 846
847 {
848 package CFClient::UI::Base;
849
850 ($draw_x, $draw_y, $draw_w, $draw_h) =
851 (0, 0, $self->{w}, $self->{h});
852 }
853
703 $self->_render; 854 $self->_render;
704 }; 855 };
705} 856}
706 857
707sub _draw { 858sub _draw {
708 my ($self) = @_; 859 my ($self) = @_;
709 860
710 my ($w, $h) = ($self->w, $self->h); 861 my ($w, $h) = @$self{qw(w h)};
711 862
712 my $tex = $self->{texture} 863 my $tex = $self->{texture}
713 or return; 864 or return;
714 865
715 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1; 868 glColor 0, 0, 0, 1;
718 869
719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
720 871
721 glDisable GL_TEXTURE_2D; 872 glDisable GL_TEXTURE_2D;
722} 873}
… …
725 876
726package CFClient::UI::ViewPort; 877package CFClient::UI::ViewPort;
727 878
728our @ISA = CFClient::UI::Window::; 879our @ISA = CFClient::UI::Window::;
729 880
881sub new {
882 my $class = shift;
883
884 $class->SUPER::new (
885 scroll_x => 0,
886 scroll_y => 1,
887 @_,
888 )
889}
890
730sub size_request { 891sub size_request {
731 my ($self) = @_; 892 my ($self) = @_;
732 893
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 894 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 895
736 @$self{qw(child_w child_h)} 896 $w = 10 if $self->{scroll_x};
737} 897 $h = 10 if $self->{scroll_y};
738 898
899 ($w, $h)
900}
901
739sub size_allocate { 902sub invoke_size_allocate {
740 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
741 904
905 my $child = $self->child;
906
907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
909
910 $self->child->configure (0, 0, $w, $h);
742 $self->update; 911 $self->update;
912
913 1
743} 914}
744 915
745sub set_offset { 916sub set_offset {
746 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
747 918
… …
780} 951}
781 952
782sub _render { 953sub _render {
783 my ($self) = @_; 954 my ($self) = @_;
784 955
956 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
957 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
958
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 960
787 $self->SUPER::_render; 961 $self->SUPER::_render;
788} 962}
789 963
… …
792package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
793 967
794our @ISA = CFClient::UI::HBox::; 968our @ISA = CFClient::UI::HBox::;
795 969
796sub new { 970sub new {
797 my $class = shift; 971 my ($class, %arg) = @_;
972
973 my $child = delete $arg{child};
798 974
799 my $self; 975 my $self;
800 976
801 my $slider = new CFClient::UI::Slider 977 my $slider = new CFClient::UI::Slider
802 vertical => 1, 978 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 979 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 980 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 981 $self->{vp}->set_offset (0, $_[1]);
806 }, 982 },
807 ; 983 ;
808 984
809 $self = $class->SUPER::new ( 985 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 986 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider, 987 slider => $slider,
812 @_, 988 %arg,
813 ); 989 );
814 990
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
818 993
819 $self 994 $self
820} 995}
821 996
822#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 998
999sub add {
1000 my ($self, $widget) = @_;
1001
1002 $self->{vp}->add ($self->{child} = $widget);
1003}
1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
1019sub update {
1020 my ($self) = @_;
1021
1022 $self->SUPER::update;
1023
1024 $self->update_slider;
1025}
1026
1027sub invoke_size_allocate {
1028 my ($self, $w, $h) = @_;
1029
1030 $self->update_slider;
1031
1032 $self->SUPER::invoke_size_allocate ($w, $h)
1033}
824 1034
825############################################################################# 1035#############################################################################
826 1036
827package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
828 1038
… …
844 1054
845 if ($self->{bg}) { 1055 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1056 my ($w, $h) = @$self{qw(w h)};
847 1057
848 glEnable GL_BLEND; 1058 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1060 glColor_premultiply @{ $self->{bg} };
851 1061
852 glBegin GL_QUADS; 1062 glBegin GL_QUADS;
853 glVertex 0 , 0; 1063 glVertex 0 , 0;
854 glVertex 0 , $h; 1064 glVertex 0 , $h;
855 glVertex $w, $h; 1065 glVertex $w, $h;
… …
868 1078
869our @ISA = CFClient::UI::Bin::; 1079our @ISA = CFClient::UI::Bin::;
870 1080
871use CFClient::OpenGL; 1081use CFClient::OpenGL;
872 1082
873my @tex = 1083my $bg =
1084 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1085 mipmap => 1, wrap => 1;
1086
1087my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1089 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1090
877sub new { 1091sub new {
878 my $class = shift; 1092 my ($class, %arg) = @_;
879
880 # TODO: user_x, user_y, overwrite moveto?
881 1093
882 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1097 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1098 can_events => 1,
888 @_ 1099 min_w => 64,
1100 min_h => 32,
1101 %arg,
889 ); 1102 );
890 1103
891 $self->{title} &&= new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
892 align => 0, 1105 align => 0,
893 valign => 1, 1106 valign => 1,
894 text => $self->{title}, 1107 text => $self->{title},
895 fontsize => $self->{border}; 1108 fontsize => $self->{border},
1109 if exists $self->{title};
1110
1111 if ($self->{has_close_button}) {
1112 $self->{close_button} =
1113 new CFClient::UI::ImageButton
1114 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") };
1116
1117 $self->CFClient::UI::Container::add ($self->{close_button});
1118 }
896 1119
897 $self 1120 $self
1121}
1122
1123sub add {
1124 my ($self, @widgets) = @_;
1125
1126 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
898} 1129}
899 1130
900sub border { 1131sub border {
901 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
902} 1133}
903 1134
904sub size_request { 1135sub size_request {
905 my ($self) = @_; 1136 my ($self) = @_;
1137
1138 $self->{title_widget}->size_request
1139 if $self->{title_widget};
1140
1141 $self->{close_button}->size_request
1142 if $self->{close_button};
906 1143
907 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
908 1145
909 ( 1146 (
910 $w + $self->border * 2, 1147 $w + $self->border * 2,
911 $h + $self->border * 2, 1148 $h + $self->border * 2,
912 ) 1149 )
913} 1150}
914 1151
915sub size_allocate { 1152sub invoke_size_allocate {
916 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
917 1154
1155 if ($self->{title_widget}) {
1156 $self->{title_widget}{w} = $w;
1157 $self->{title_widget}{h} = $h;
1158 $self->{title_widget}->invoke_size_allocate ($w, $h);
1159 }
1160
1161 my $border = $self->border;
1162
918 $h -= List::Util::max 0, $self->border * 2; 1163 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1164 $w -= List::Util::max 0, $border * 2;
920 1165
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
924 $self->child->configure ($self->border, $self->border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
925}
926 1167
1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1169 if $self->{close_button};
1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1179 1
1180}
1181
927sub button_down { 1182sub invoke_button_down {
928 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
929 1184
930 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
931 my $border = $self->border; 1186 my $border = $self->border;
932 1187
… …
945 my ($ev, $x, $y) = @_; 1200 my ($ev, $x, $y) = @_;
946 1201
947 my $dx = $ev->{x} - $ox; 1202 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
949 1204
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1207
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1209 $self->realloc;
954 }; 1210 };
955 1211
956 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1216 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
962 1218
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
964 1220
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1222 # HACK: the next line is required to enforce placement
1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1224 };
1225 } else {
1226 return 0;
1227 }
1228
968 } 1229 1
969} 1230}
970 1231
971sub button_up { 1232sub invoke_button_up {
972 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
973 1234
974 delete $self->{motion}; 1235 ! ! delete $self->{motion}
975} 1236}
976 1237
977sub mouse_motion { 1238sub invoke_mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
979 1240
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242
1243 ! ! $self->{motion}
981} 1244}
982 1245
983sub _draw { 1246sub _draw {
984 my ($self) = @_; 1247 my ($self) = @_;
985 1248
1249 my $child = $self->{children}[0];
1250
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1251 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1252 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1253
989 glEnable GL_TEXTURE_2D; 1254 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1256
992 my $border = $self->border; 1257 my $border = $self->border;
993 1258
994 glColor @{ $self->{border_bg} }; 1259 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1260 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1261 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1262 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1263 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1264
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1265 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1266 glColor @{ $self->{bg} };
1002 1267
1003 # TODO: repeat texture not scale 1268 # TODO: repeat texture not scale
1269 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1270 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1271 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1272 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1273 }
1014 1274
1015 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1016 1276
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1277 $child->draw;
1278
1279 if ($self->{title_widget}) {
1280 glTranslate 0, $border - $self->{h};
1281 $self->{title_widget}->_draw;
1282
1283 glTranslate 0, - ($border - $self->{h});
1284 }
1285
1286 $self->{close_button}->draw
1287 if $self->{close_button};
1020} 1288}
1021 1289
1022############################################################################# 1290#############################################################################
1023 1291
1024package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1032sub new { 1300sub new {
1033 my $class = shift; 1301 my $class = shift;
1034 1302
1035 $class->SUPER::new ( 1303 $class->SUPER::new (
1036 col_expand => [], 1304 col_expand => [],
1037 @_ 1305 @_,
1038 ) 1306 )
1307}
1308
1309sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1311}
1040 1312
1041sub add { 1313sub add {
1042 my ($self, $x, $y, $child) = @_; 1314 my ($self, $x, $y, $child) = @_;
1043 1315
1044 $child->set_parent ($self); 1316 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1046 1318
1047 $child->check_size; 1319 $self->realloc;
1048} 1320}
1049 1321
1050sub children { 1322sub remove {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1323 my ($self, $child) = @_;
1052}
1053 1324
1325 # TODO: not yet implemented
1326}
1327
1054# TODO: move to container class maybe? send childs a signal on removal? 1328# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1329sub clear {
1056 my ($self) = @_; 1330 my ($self) = @_;
1057 1331
1058 my @children = $self->children; 1332 my @children = $self->children;
1059 delete $self->{children}; 1333 delete $self->{children};
… …
1061 for (@children) { 1335 for (@children) {
1062 delete $_->{parent}; 1336 delete $_->{parent};
1063 $_->hide; 1337 $_->hide;
1064 } 1338 }
1065 1339
1066 $self->update; 1340 $self->realloc;
1067} 1341}
1068 1342
1069sub get_wh { 1343sub get_wh {
1070 my ($self) = @_; 1344 my ($self) = @_;
1071 1345
… …
1097 (sum @$ws), 1371 (sum @$ws),
1098 (sum @$hs), 1372 (sum @$hs),
1099 ) 1373 )
1100} 1374}
1101 1375
1102sub size_allocate { 1376sub invoke_size_allocate {
1103 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1104 1378
1105 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1106 1380
1107 my $req_w = sum @$ws; 1381 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1382 my $req_h = (sum @$hs) || 1;
1109 1383
1110 # TODO: nicer code && do row_expand 1384 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1385 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1386 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1387 my $col_expand = (sum @col_expand) || 1;
… …
1139 } 1413 }
1140 1414
1141 $y += $row_h; 1415 $y += $row_h;
1142 } 1416 }
1143 1417
1418 1
1144} 1419}
1145 1420
1146sub find_widget { 1421sub find_widget {
1147 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1148 1423
… …
1167 } 1442 }
1168} 1443}
1169 1444
1170############################################################################# 1445#############################################################################
1171 1446
1447package CFClient::UI::Box;
1448
1449our @ISA = CFClient::UI::Container::;
1450
1451sub size_request {
1452 my ($self) = @_;
1453
1454 $self->{vertical}
1455 ? (
1456 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1457 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1458 )
1459 : (
1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1462 )
1463}
1464
1465sub invoke_size_allocate {
1466 my ($self, $w, $h) = @_;
1467
1468 my $space = $self->{vertical} ? $h : $w;
1469 my @children = $self->visible_children;
1470
1471 my @req;
1472
1473 if ($self->{homogeneous}) {
1474 @req = ($space / (@children || 1)) x @children;
1475 } else {
1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1477 my $req = List::Util::sum @req;
1478
1479 if ($req > $space) {
1480 # ah well, not enough space
1481 $_ *= $space / $req for @req;
1482 } else {
1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1484
1485 $space = ($space - $req) / $expand; # remaining space to give away
1486
1487 $req[$_] += $space * $children[$_]{expand}
1488 for 0 .. $#children;
1489 }
1490 }
1491
1492 CFClient::UI::harmonize \@req;
1493
1494 my $pos = 0;
1495 for (0 .. $#children) {
1496 my $alloc = $req[$_];
1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1498
1499 $pos += $alloc;
1500 }
1501
1502 1
1503}
1504
1505#############################################################################
1506
1172package CFClient::UI::HBox; 1507package CFClient::UI::HBox;
1173 1508
1174# TODO: wrap into common Box base class
1175
1176our @ISA = CFClient::UI::Container::; 1509our @ISA = CFClient::UI::Box::;
1177 1510
1178sub size_request { 1511sub new {
1179 my ($self) = @_; 1512 my $class = shift;
1180 1513
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1514 $class->SUPER::new (
1182 1515 vertical => 0,
1183 ( 1516 @_,
1184 (List::Util::sum map $_->[0], @alloc),
1185 (List::Util::max map $_->[1], @alloc),
1186 ) 1517 )
1187} 1518}
1188 1519
1189sub size_allocate {
1190 my ($self, $w, $h) = @_;
1191
1192 ($h, $w) = ($w, $h);
1193
1194 my $children = $self->{children};
1195
1196 my @h = map $_->{req_w}, @$children;
1197
1198 my $req_h = List::Util::sum @h;
1199
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children;
1205 $exp ||= 1;
1206
1207 for (0 .. $#$children) {
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 }
1214 }
1215
1216 CFClient::UI::harmonize \@h;
1217
1218 my $y = 0;
1219 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_];
1222 $child->configure ($y, 0, $h, $w);
1223
1224 $y += $h;
1225 }
1226
1227 1
1228}
1229
1230############################################################################# 1520#############################################################################
1231 1521
1232package CFClient::UI::VBox; 1522package CFClient::UI::VBox;
1233 1523
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1524our @ISA = CFClient::UI::Box::;
1237 1525
1238sub size_request { 1526sub new {
1239 my ($self) = @_; 1527 my $class = shift;
1240 1528
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1529 $class->SUPER::new (
1242 1530 vertical => 1,
1243 ( 1531 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1532 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1533}
1287 1534
1288############################################################################# 1535#############################################################################
1289 1536
1290package CFClient::UI::Label; 1537package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1554 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1555 layout => (new CFClient::Layout),
1309 fontsize => 1, 1556 fontsize => 1,
1310 align => -1, 1557 align => -1,
1311 valign => -1, 1558 valign => -1,
1312 padding => 2, 1559 padding_x => 2,
1560 padding_y => 2,
1313 can_events => 0, 1561 can_events => 0,
1314 %arg 1562 %arg
1315 ); 1563 );
1316 1564
1317 if (exists $self->{template}) { 1565 if (exists $self->{template}) {
… …
1344 1592
1345 delete $self->{texture}; 1593 delete $self->{texture};
1346 $self->SUPER::update; 1594 $self->SUPER::update;
1347} 1595}
1348 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1349sub set_text { 1604sub set_text {
1350 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1351 1606
1352 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1354 1609
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1357 1611
1612 delete $self->{size_req};
1613 $self->realloc;
1358 $self->update; 1614 $self->update;
1359 $self->check_size;
1360} 1615}
1361 1616
1362sub set_markup { 1617sub set_markup {
1363 my ($self, $markup) = @_; 1618 my ($self, $markup) = @_;
1364 1619
1365 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1366 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1367 1622
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1624
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1372 1626
1627 delete $self->{size_req};
1628 $self->realloc;
1373 $self->update; 1629 $self->update;
1374 $self->check_size;
1375} 1630}
1376 1631
1377sub size_request { 1632sub size_request {
1378 my ($self) = @_; 1633 my ($self) = @_;
1379 1634
1635 $self->{size_req} ||= do {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1641
1386 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1387 1643
1388 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1648
1392 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1393 1650
1394 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1396 } 1656 };
1397 1657
1398 ( 1658 @{ $self->{size_req} }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1659}
1403 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1404sub size_allocate { 1665sub invoke_size_allocate {
1405 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1406 1667
1668 delete $self->{ox};
1669
1407 delete $self->{texture}; 1670 delete $self->{texture}
1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1408} 1674}
1409 1675
1410sub set_fontsize { 1676sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1412 1678
1413 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1414 delete $self->{texture}; 1681 delete $self->{texture};
1415 1682
1416 $self->update; 1683 $self->realloc;
1417 $self->check_size; 1684}
1685
1686sub reconfigure {
1687 my ($self) = @_;
1688
1689 delete $self->{size_req};
1690 delete $self->{texture};
1691
1692 $self->SUPER::reconfigure;
1418} 1693}
1419 1694
1420sub _draw { 1695sub _draw {
1421 my ($self) = @_; 1696 my ($self) = @_;
1422 1697
1423 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1424 1699
1425 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1426 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1427 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1428 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1707
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1708 [$self->{layout}->size]
1434
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1437 : ($self->{w} - $tex->{w}) * 0.5);
1438
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1441 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1709 };
1445 1710
1446 glEnable GL_TEXTURE_2D; 1711 unless (exists $self->{ox}) {
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1714 : ($self->{w} - $size->[0]) * 0.5);
1448 1715
1449 if ($tex->{format} == GL_ALPHA) { 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1450 glColor @{$self->{fg}}; 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1718 : ($self->{h} - $size->[1]) * 0.5);
1452 } else {
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1454 } 1719 };
1455 1720
1456 glDisable GL_TEXTURE_2D; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1723
1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1457} 1725}
1458 1726
1459############################################################################# 1727#############################################################################
1460 1728
1461package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1474 active_fg => [0, 0, 0], 1742 active_fg => [0, 0, 0],
1475 can_hover => 1, 1743 can_hover => 1,
1476 can_focus => 1, 1744 can_focus => 1,
1477 valign => 0, 1745 valign => 0,
1478 can_events => 1, 1746 can_events => 1,
1747 #text => ...
1748 #hidden => "*",
1479 @_ 1749 @_
1480 ) 1750 )
1481} 1751}
1482 1752
1483sub _set_text { 1753sub _set_text {
… …
1485 1755
1486 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1487 1757
1488 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1489 1759
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1761 $self->{text} = $text;
1494 1762
1495 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1497 1766
1498 $self->emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1499} 1771}
1500 1772
1501sub set_text { 1773sub set_text {
1502 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1503 1775
1504 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1777 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1778}
1509 1779
1510sub get_text { 1780sub get_text {
1511 $_[0]{text} 1781 $_[0]{text}
1512} 1782}
… …
1517 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1518 1788
1519 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1520} 1790}
1521 1791
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526}
1527
1528sub key_down { 1792sub invoke_key_down {
1529 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1530 1794
1531 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1532 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1533 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1548 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1814 $self->emit ('escape');
1551 } elsif ($uni) { 1815 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else {
1818 return 0;
1553 } 1819 }
1554 1820
1555 $self->_set_text ($text); 1821 $self->_set_text ($text);
1556 $self->update;
1557 $self->check_size;
1558}
1559 1822
1823 $self->realloc;
1824
1825 1
1826}
1827
1560sub focus_in { 1828sub invoke_focus_in {
1561 my ($self) = @_; 1829 my ($self) = @_;
1562 1830
1563 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1564 1832
1565 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1566} 1834}
1567 1835
1568sub button_down { 1836sub invoke_button_down {
1569 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1570 1838
1571 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1572 1840
1573 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1574 1842
1575 # byte-index to char-index 1843 # byte-index to char-index
1576 my $text = $self->{text}; 1844 my $text = $self->{text};
1577 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1579 1847
1580 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1581 $self->update; 1849 $self->update;
1850
1851 1
1582} 1852}
1583 1853
1584sub mouse_motion { 1854sub invoke_mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1856# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1857
1858 1
1587} 1859}
1588 1860
1589sub _draw { 1861sub _draw {
1590 my ($self) = @_; 1862 my ($self) = @_;
1591 1863
1592 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1593 1865
1594 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1597 } else { 1869 } else {
1598 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1599 } 1871 }
1600 1872
1601 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1876 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1632 1904
1633our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1634 1906
1635use CFClient::OpenGL; 1907use CFClient::OpenGL;
1636 1908
1637sub key_down { 1909sub invoke_key_down {
1638 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1639 1911
1640 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1641 1913
1642 if ($sym == 13) { 1914 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1645 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1920 $self->emit (activate => $txt);
1648 $self->update; 1921 $self->update;
1649 1922
… …
1668 } else { 1941 } else {
1669 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1670 } 1943 }
1671 1944
1672 } else { 1945 } else {
1673 $self->SUPER::key_down ($ev); 1946 return $self->SUPER::invoke_key_down ($ev)
1947 }
1948
1674 } 1949 1
1675
1676} 1950}
1677 1951
1678############################################################################# 1952#############################################################################
1679 1953
1680package CFClient::UI::Button; 1954package CFClient::UI::Button;
… …
1689 1963
1690sub new { 1964sub new {
1691 my $class = shift; 1965 my $class = shift;
1692 1966
1693 $class->SUPER::new ( 1967 $class->SUPER::new (
1694 padding => 4, 1968 padding_x => 4,
1969 padding_y => 4,
1695 fg => [1, 1, 1], 1970 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1971 active_fg => [0, 0, 1],
1697 can_hover => 1, 1972 can_hover => 1,
1698 align => 0, 1973 align => 0,
1699 valign => 0, 1974 valign => 0,
1700 can_events => 1, 1975 can_events => 1,
1701 @_ 1976 @_
1702 ) 1977 )
1703} 1978}
1704 1979
1705sub button_up { 1980sub invoke_button_up {
1706 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1707 1982
1983 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1985 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1986
1711 } 1987 1
1712} 1988}
1713 1989
1714sub _draw { 1990sub _draw {
1715 my ($self) = @_; 1991 my ($self) = @_;
1716 1992
1717 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1994
1723 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1726 1998
… …
1731 $self->SUPER::_draw; 2003 $self->SUPER::_draw;
1732} 2004}
1733 2005
1734############################################################################# 2006#############################################################################
1735 2007
2008package CFClient::UI::ImageButton;
2009
2010our @ISA = CFClient::UI::Image::;
2011
2012use CFClient::OpenGL;
2013
2014my %textures;
2015
2016sub new {
2017 my $class = shift;
2018
2019 my $self = $class->SUPER::new (
2020 padding_x => 4,
2021 padding_y => 4,
2022 fg => [1, 1, 1],
2023 active_fg => [0, 0, 1],
2024 can_hover => 1,
2025 align => 0,
2026 valign => 0,
2027 can_events => 1,
2028 @_
2029 );
2030}
2031
2032sub invoke_button_up {
2033 my ($self, $ev, $x, $y) = @_;
2034
2035 $self->emit ("activate")
2036 if $x >= 0 && $x < $self->{w}
2037 && $y >= 0 && $y < $self->{h};
2038
2039 1
2040}
2041
2042#############################################################################
2043
1736package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
1737 2045
1738our @ISA = CFClient::UI::DrawBG::; 2046our @ISA = CFClient::UI::DrawBG::;
1739 2047
1740my @tex = 2048my @tex =
… …
1745 2053
1746sub new { 2054sub new {
1747 my $class = shift; 2055 my $class = shift;
1748 2056
1749 $class->SUPER::new ( 2057 $class->SUPER::new (
1750 padding => 2, 2058 padding_x => 2,
2059 padding_y => 2,
1751 fg => [1, 1, 1], 2060 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 2061 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 2062 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 2063 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 2064 state => 0,
… …
1759} 2068}
1760 2069
1761sub size_request { 2070sub size_request {
1762 my ($self) = @_; 2071 my ($self) = @_;
1763 2072
1764 ($self->{padding} * 2 + 6) x 2 2073 (6) x 2
1765} 2074}
1766 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1767sub button_down { 2084sub invoke_button_down {
1768 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1769 2086
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 2089 $self->toggle;
1773 $self->emit (changed => $self->{state}); 2090 } else {
2091 return 0
2092 }
2093
1774 } 2094 1
1775} 2095}
1776 2096
1777sub _draw { 2097sub _draw {
1778 my ($self) = @_; 2098 my ($self) = @_;
1779 2099
1780 $self->SUPER::_draw; 2100 $self->SUPER::_draw;
1781 2101
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 2103
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2104 my ($w, $h) = @$self{qw(w h)};
2105
2106 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 2107
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2109
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2111
… …
1797package CFClient::UI::Image; 2119package CFClient::UI::Image;
1798 2120
1799our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1800 2122
1801use CFClient::OpenGL; 2123use CFClient::OpenGL;
1802use Carp qw/confess/;
1803 2124
1804our %loaded_images; 2125our %texture_cache;
1805 2126
1806sub new { 2127sub new {
1807 my $class = shift; 2128 my $class = shift;
1808 2129
1809 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
1810 2134
1811 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
1812 2137
1813 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1814 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1815 2140
1816 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
1817 2142
1818 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1819
1820 $self->{aspect} = $tex->{w} / $tex->{h};
1821 2144
1822 $self 2145 $self
1823} 2146}
1824 2147
1825sub size_request { 2148sub size_request {
1826 my ($self) = @_; 2149 my ($self) = @_;
1827 2150
1828 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
1829} 2152}
1830 2153
1831sub _draw { 2154sub _draw {
1832 my ($self) = @_; 2155 my ($self) = @_;
1833 2156
… …
1942 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
1943 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
1944 2267
1945 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1947 2273
1948 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2279
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
1969 2296
1970 if ($t3) { 2297 if ($t3) {
1971 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
1972 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
1973 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1974 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1975 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1976 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1977 glEnd; 2304 glEnd;
1978 } 2305 }
1979 2306
1980 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2053 my $self = $class->SUPER::new ( 2380 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2381 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2382 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2383 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2384 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2385 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2386 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2387 min_h => $::WIDTH / 80,
2061 vertical => 0, 2388 vertical => 0,
2062 can_hover => 1, 2389 can_hover => 1,
2063 inner_pad => 0.02, 2390 inner_pad => 0.02,
2064 @_ 2391 @_
2065 ); 2392 );
… …
2068 $self->update; 2395 $self->update;
2069 2396
2070 $self 2397 $self
2071} 2398}
2072 2399
2400sub set_range {
2401 my ($self, $range) = @_;
2402
2403 ($range, $self->{range}) = ($self->{range}, $range);
2404
2405 if ("@$range" ne "@{$self->{range}}") {
2406 $self->update;
2407 $self->set_value ($self->{range}[0]);
2408 }
2409}
2410
2073sub set_value { 2411sub set_value {
2074 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2075 2413
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2414 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2415
2078 $hi = $lo + 1 if $hi <= $lo; 2416 $hi = $lo + 1 if $hi <= $lo;
2079 2417
2418 $page = $hi - $lo if $page > $hi - $lo;
2419
2080 $value = $lo if $value < $lo; 2420 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2421 $value = $hi - $page if $value > $hi - $page;
2082 2422
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2423 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2424 if $unit;
2085
2086 $page = $hi - $lo if $page > $hi - $lo;
2087 2425
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2427
2090 if ($value != $old_value) { 2428 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2429 $self->emit (changed => $value);
… …
2094} 2432}
2095 2433
2096sub size_request { 2434sub size_request {
2097 my ($self) = @_; 2435 my ($self) = @_;
2098 2436
2099 my $w = $self->{req_w}; 2437 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2438}
2104 2439
2105sub button_down { 2440sub invoke_button_down {
2106 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2107 2442
2108 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2444
2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2446
2109 $self->mouse_motion ($ev, $x, $y); 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2110} 2448}
2111 2449
2112sub mouse_motion { 2450sub invoke_mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2114 2452
2115 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2455
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2456 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2457
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2458 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2459
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2460 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2461 } else {
2462 return 0;
2463 }
2464
2123 } 2465 1
2124} 2466}
2125 2467
2126sub update { 2468sub update {
2127 my ($self) = @_; 2469 my ($self) = @_;
2128 2470
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2471 delete $self->{knob_w};
2472 $self->SUPER::update;
2473}
2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2479 $self->set_value ($self->{range}[0]);
2131 2480
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2482 my $range = ($hi - $page - $lo) || 1e-100;
2133 2483
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2484 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2485
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2486 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2487 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2488
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2489 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2490 $value = $value * $self->{scale} + $self->{offset};
2140 2491
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2493 $self->{knob_w} = $knob_w;
2148 }); 2494 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2495
2156 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2157 2497
2158 glScale $self->{w}, $self->{h}; 2498 glScale $self->{w}, $self->{h};
2159 2499
… …
2179 glDisable GL_TEXTURE_2D; 2519 glDisable GL_TEXTURE_2D;
2180} 2520}
2181 2521
2182############################################################################# 2522#############################################################################
2183 2523
2524package CFClient::UI::ValSlider;
2525
2526our @ISA = CFClient::UI::HBox::;
2527
2528sub new {
2529 my ($class, %arg) = @_;
2530
2531 my $range = delete $arg{range};
2532
2533 my $self = $class->SUPER::new (
2534 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2535 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2536 to_value => sub { shift },
2537 from_value => sub { shift },
2538 %arg,
2539 );
2540
2541 $self->{slider}->connect (changed => sub {
2542 my ($self, $value) = @_;
2543 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2544 $self->{parent}->emit (changed => $value);
2545 });
2546
2547# $self->{entry}->connect (changed => sub {
2548# my ($self, $value) = @_;
2549# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2550# $self->{parent}->emit (changed => $value);
2551# });
2552
2553 $self->add ($self->{slider}, $self->{entry});
2554
2555 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2556
2557 $self
2558}
2559
2560sub set_range { shift->{slider}->set_range (@_) }
2561sub set_value { shift->{slider}->set_value (@_) }
2562
2563#############################################################################
2564
2184package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2185 2566
2186our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2187 2568
2188use CFClient::OpenGL; 2569use CFClient::OpenGL;
2189 2570
… …
2191 my $class = shift; 2572 my $class = shift;
2192 2573
2193 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2194 fontsize => 1, 2575 fontsize => 1,
2195 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2196 #font => default_font 2578 #font => default_font
2197 @_, 2579 @_,
2198 2580
2199 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2200 par => [], 2582 par => [],
2201 height => 0, 2583 height => 0,
2202 children => [ 2584 children => [
2203 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2204 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2215 2597
2216 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2217 $self->reflow; 2599 $self->reflow;
2218} 2600}
2219 2601
2602sub size_request {
2603 my ($self) = @_;
2604
2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2609}
2610
2220sub size_allocate { 2611sub invoke_size_allocate {
2221 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2222 2613
2223 $self->SUPER::size_allocate ($w, $h); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2224 2616
2225 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2619 $self->{layout}->set_width ($empty->{w});
2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2228 2621
2229 $self->reflow; 2622 $self->reflow;
2230}
2231 2623
2232sub text_height { 2624 local $self->{children} = [$empty, $slider];
2233 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2234 2630
2235 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2236 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2239 $layout->set_markup ($text); 2638 $layout->set_markup ($para->{markup});
2639
2640 $layout->set_shapes (
2641 map
2642 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2643 @{$para->{widget}}
2240 2644 );
2241 ($layout->size)[1] 2645
2646 $layout
2242} 2647}
2243 2648
2244sub reflow { 2649sub reflow {
2245 my ($self) = @_; 2650 my ($self) = @_;
2246 2651
2247 $self->{need_reflow}++; 2652 $self->{need_reflow}++;
2248 $self->update; 2653 $self->update;
2249} 2654}
2250 2655
2656sub set_offset {
2657 my ($self, $offset) = @_;
2658
2659 # todo: base offset on lines or so, not on pixels
2660 $self->{children}[1]->set_value ($offset);
2661}
2662
2663sub clear {
2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2668
2669 $self->{par} = [];
2670 $self->{height} = 0;
2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672}
2673
2251sub add_paragraph { 2674sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2253 2676
2254 #TODO: intelligently "reformat" paragraph 2677 my ($text, @w) = ref $para ? @$para : $para;
2255 2678
2256 for my $line (split /\n/, $text) { 2679 $para = {
2257 my $height = $self->text_height ($line); 2680 w => 1e10,
2258 $self->{height} += $height; 2681 wrapped => 1,
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2260 } 2686 };
2261 2687
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2688 $self->add (@w) if @w;
2263 $self->{children}[1]->update; 2689 push @{$self->{par}}, $para;
2690
2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2694
2695sub scroll_to_bottom {
2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2264} 2700}
2265 2701
2266sub update { 2702sub update {
2267 my ($self) = @_; 2703 my ($self) = @_;
2268 2704
… …
2270 2706
2271 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2272 2708
2273 delete $self->{texture}; 2709 delete $self->{texture};
2274 2710
2275 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713
2276 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2715 my $height = 0;
2278 2716
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2280 for @{$self->{par}}; 2717 for my $para (@{$self->{par}}) {
2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719 my $layout = $self->get_layout ($para);
2720 my ($w, $h) = $layout->size;
2721
2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2725 }
2726
2727 $height += $para->{h};
2728 }
2281 2729
2282 $self->{height} = $height; 2730 $self->{height} = $height;
2283 2731
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2285 $self->{children}[1]->update; 2733
2286
2287 delete $self->{texture}; 2734 delete $self->{texture};
2288 } 2735 }
2289 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2742 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2293 2744
2294 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2295 2746
2296 my $y0 = $top; 2747 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2748 my $y1 = $top + $H;
2298 2749
2299 my $y = 0; 2750 my $y = 0;
2300 2751
2301 my $layout = $self->{layout};
2302
2303 $layout->set_font ($self->{font}) if $self->{font};
2304
2305 glEnable GL_BLEND;
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307
2308 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2309 my $h = $par->[0]; 2753 my $h = $para->{h};
2310 2754
2311 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] });
2313 $layout->set_width ($self->{w} - $par->[2]);
2314 $layout->set_markup ($par->[3]);
2315 2756
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2317 2758
2318 glRasterPos $par->[2], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2760
2761 if (my @w = @{ $para->{widget} }) {
2762 my @s = $layout->get_shapes;
2763
2764 for (@w) {
2765 my ($dx, $dy) = splice @s, 0, 2, ();
2766
2767 $_->{x} = $dx + $para->{indent};
2768 $_->{y} = $dy + $y - $y0;
2769
2770 $_->draw;
2771 }
2772 }
2320 } 2773 }
2321 2774
2322 $y += $h; 2775 $y += $h;
2323 } 2776 }
2324
2325 glDisable GL_BLEND;
2326 }; 2777 };
2327 }); 2778 });
2328} 2779}
2329 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2330sub _draw { 2790sub _draw {
2331 my ($self) = @_; 2791 my ($self) = @_;
2332 2792
2333 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2796 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2338 2798
2339 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2340
2341} 2800}
2342 2801
2343############################################################################# 2802#############################################################################
2344 2803
2345package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2390 2849
2391sub new { 2850sub new {
2392 my $class = shift; 2851 my $class = shift;
2393 2852
2394 my $self = $class->SUPER::new ( 2853 my $self = $class->SUPER::new (
2395 state => 0, 2854 state => 0,
2396 connect_activate => \&toggle_flopper, 2855 on_activate => \&toggle_flopper,
2397 @_ 2856 @_
2398 ); 2857 );
2399 2858
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2859 $self
2406} 2860}
2407 2861
2408sub toggle_flopper { 2862sub toggle_flopper {
2409 my ($self) = @_; 2863 my ($self) = @_;
2410 2864
2411 # TODO: use animation 2865 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2866}
2423 2867
2424############################################################################# 2868#############################################################################
2425 2869
2426package CFClient::UI::Tooltip; 2870package CFClient::UI::Tooltip;
… …
2439} 2883}
2440 2884
2441sub set_tooltip_from { 2885sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2886 my ($self, $widget) = @_;
2443 2887
2888 my $tooltip = $widget->{tooltip};
2889
2890 if ($ENV{CFPLUS_DEBUG} & 2) {
2891 $tooltip .= "\n\n" . (ref $widget) . "\n"
2892 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2893 . "req $widget->{req_w} $widget->{req_h}\n"
2894 . "visible $widget->{visible}";
2895 }
2896
2897 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//;
2899
2444 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2901 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2903 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2904 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2905 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2906 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2457 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2458 2914
2459 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2460} 2916}
2461 2917
2462sub size_allocate { 2918sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2464 2920
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2921 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2922}
2923
2924sub invoke_visibility_change {
2925 my ($self, $visible) = @_;
2926
2927 return unless $visible;
2928
2929 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner}
2931 or return;
2932
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w};
2937
2938 $self->move_abs ($x, $y);
2939 });
2466} 2940}
2467 2941
2468sub _draw { 2942sub _draw {
2469 my ($self) = @_; 2943 my ($self) = @_;
2470 2944
… …
2487 glVertex $w, $h; 2961 glVertex $w, $h;
2488 glVertex $w, 0; 2962 glVertex $w, 0;
2489 glEnd; 2963 glEnd;
2490 2964
2491 glTranslate 2 - 0.375, 2 - 0.375; 2965 glTranslate 2 - 0.375, 2 - 0.375;
2966
2492 $self->SUPER::_draw; 2967 $self->SUPER::_draw;
2493} 2968}
2494 2969
2495############################################################################# 2970#############################################################################
2496 2971
… …
2502 2977
2503sub new { 2978sub new {
2504 my $class = shift; 2979 my $class = shift;
2505 2980
2506 my $self = $class->SUPER::new ( 2981 my $self = $class->SUPER::new (
2507 aspect => 1, 2982 aspect => 1,
2983 can_events => 0,
2508 @_, 2984 @_,
2509 ); 2985 );
2510 2986
2511 if ($self->{anim} && $self->{animspeed}) { 2987 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2988 Scalar::Util::weaken (my $widget = $self);
… …
2527 3003
2528sub size_request { 3004sub size_request {
2529 (32, 8) 3005 (32, 8)
2530} 3006}
2531 3007
3008sub update {
3009 my ($self) = @_;
3010
3011 return unless $self->{visible};
3012
3013 $self->SUPER::update;
3014}
3015
2532sub _draw { 3016sub _draw {
2533 my ($self) = @_; 3017 my ($self) = @_;
2534 3018
2535 return unless $::CONN;#d# manage and cache textures differently 3019 return unless $::CONN;
2536 3020
2537 my $face; 3021 my $face;
2538 3022
2539 if ($self->{frame}) { 3023 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 3024 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 3031
2548 if ($tex) { 3032 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2554 } 3038 }
2555} 3039}
2556 3040
2557sub DESTROY { 3041sub destroy {
2558 my ($self) = @_; 3042 my ($self) = @_;
2559 3043
2560 $self->{timer}->cancel 3044 $self->{timer}->cancel
2561 if $self->{timer}; 3045 if $self->{timer};
2562 3046
2563 $self->SUPER::DESTROY; 3047 $self->SUPER::destroy;
2564} 3048}
2565 3049
2566############################################################################# 3050#############################################################################
2567 3051
2568package CFClient::UI::InventoryItem; 3052package CFClient::UI::Buttonbar;
2569 3053
2570our @ISA = CFClient::UI::HBox::; 3054our @ISA = CFClient::UI::HBox::;
2571 3055
2572sub _item_to_desc { 3056# TODO: should actualyl wrap buttons and other goodies.
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719}
2720 3057
2721############################################################################# 3058#############################################################################
2722 3059
2723package CFClient::UI::Menu; 3060package CFClient::UI::Menu;
2724 3061
… …
2736 ); 3073 );
2737 3074
2738 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2739 3076
2740 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2741 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2742 3079
2743 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2744 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
2745 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2746 can_hover => 1, 3097 can_hover => 1,
2747 can_events => 1, 3098 can_events => 1,
2748 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2749 } 3102 }
2750 3103
2751 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2752 3105
2753 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2765 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 3119 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2768 3121
2769 $self->show; 3122 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3123 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 3124}
2772 3125
2773sub mouse_motion { 3126sub invoke_mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2775 3128
2776 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2779}
2780 3132
3133 0
3134}
3135
2781sub button_up { 3136sub invoke_button_up {
2782 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2783 3138
2784 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 3140 undef $GRAB;
2786 $self->hide; 3141 $self->hide;
2787 3142
2788 $self->emit ("popdown"); 3143 $self->emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
3145 } else {
3146 return 0
3147 }
3148
2790 } 3149 1
2791} 3150}
2792 3151
2793############################################################################# 3152#############################################################################
2794 3153
2795package CFClient::UI::Statusbox; 3154package CFClient::UI::Multiplexer;
2796 3155
2797our @ISA = CFClient::UI::VBox::; 3156our @ISA = CFClient::UI::Container::;
2798 3157
2799sub new { 3158sub new {
2800 my $class = shift; 3159 my $class = shift;
2801 3160
2802 $class->SUPER::new ( 3161 my $self = $class->SUPER::new (
3162 @_,
3163 );
3164
3165 $self->{current} = $self->{children}[0]
3166 if @{ $self->{children} };
3167
3168 $self
3169}
3170
3171sub add {
3172 my ($self, @widgets) = @_;
3173
3174 $self->SUPER::add (@widgets);
3175
3176 $self->{current} = $self->{children}[0]
3177 if @{ $self->{children} };
3178}
3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3184}
3185
3186sub set_current_page {
3187 my ($self, $page_or_widget) = @_;
3188
3189 my $widget = ref $page_or_widget
3190 ? $page_or_widget
3191 : $self->{children}[$page_or_widget];
3192
3193 $self->{current} = $widget;
3194 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3195
3196 $self->emit (page_changed => $self->{current});
3197
3198 $self->realloc;
3199}
3200
3201sub visible_children {
3202 $_[0]{current}
3203}
3204
3205sub size_request {
3206 my ($self) = @_;
3207
3208 $self->{current}->size_request
3209}
3210
3211sub invoke_size_allocate {
3212 my ($self, $w, $h) = @_;
3213
3214 $self->{current}->configure (0, 0, $w, $h);
3215
3216 1
3217}
3218
3219sub _draw {
3220 my ($self) = @_;
3221
3222 $self->{current}->draw;
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Notebook;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self
3238 @_,
3239 );
3240
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3242 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3243
3244 $self
3245}
3246
3247sub add {
3248 my ($self, $title, $widget, $tooltip) = @_;
3249
3250 Scalar::Util::weaken $self;
3251
3252 $self->{buttonbar}->add (new CFClient::UI::Button
3253 markup => $title,
3254 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) },
3256 );
3257
3258 $self->{multiplexer}->add ($widget);
3259}
3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3265}
3266
3267sub set_current_page {
3268 my ($self, $page) = @_;
3269
3270 $self->{multiplexer}->set_current_page ($page);
3271 $self->emit (page_changed => $self->{multiplexer}{current});
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Combobox;
3277
3278use utf8;
3279
3280our @ISA = CFClient::UI::Button::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (
3286 options => [], # [value, title, longdesc], ...
3287 value => undef,
3288 @_,
3289 );
3290
3291 $self->_set_value ($self->{value});
3292
3293 $self
3294}
3295
3296sub invoke_button_down {
3297 my ($self, $ev) = @_;
3298
3299 my @menu_items;
3300
3301 for (@{ $self->{options} }) {
3302 my ($value, $title, $tooltip) = @$_;
3303
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 }
3306
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308}
3309
3310sub _set_value {
3311 my ($self, $value) = @_;
3312
3313 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3314 or return;
3315
3316 $self->{value} = $item->[0];
3317 $self->set_markup ("$item->[1] ⇓");
3318 $self->set_tooltip ($item->[2]);
3319}
3320
3321sub set_value {
3322 my ($self, $value) = @_;
3323
3324 return unless $self->{value} ne $value;
3325
3326 $self->_set_value ($value);
3327 $self->emit (changed => $value);
3328}
3329
3330#############################################################################
3331
3332package CFClient::UI::Statusbox;
3333
3334our @ISA = CFClient::UI::VBox::;
3335
3336sub new {
3337 my $class = shift;
3338
3339 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3340 fontsize => 0.8,
2804 @_, 3341 @_,
2805 ) 3342 );
3343
3344 Scalar::Util::weaken (my $this = $self);
3345
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347
3348 $self
2806} 3349}
2807 3350
2808sub reorder { 3351sub reorder {
2809 my ($self) = @_; 3352 my ($self) = @_;
2810 my $NOW = time; 3353 my $NOW = Time::HiRes::time;
3354
3355 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} };
2811 3359
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3362 }
2815 3363
… …
2818 my @items = sort { 3366 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3367 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3368 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3369 } values %{ $self->{item} };
2822 3370
3371 $self->{timer}->interval (1);
3372
2823 my $count = 10 + 1; 3373 my $count = 10 + 1;
2824 for my $item (@items) { 3374 for my $item (@items) {
2825 last unless --$count; 3375 last unless --$count;
2826 3376
2827 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3379 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3380 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3381 : $item->{text};
2832 3382
… …
2840 tooltip => $item->{tooltip}, 3390 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3391 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3392 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3393 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3394 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3395 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3396 can_events => 1,
2847 can_hover => 1 3397 can_hover => 1
2848 }; 3398 };
3399
3400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3402 $label->update;
3403 $label->set_max_size (undef, $label->{req_h} * $diff)
3404 if $diff < 1;
3405 $self->{timer}->interval (1/30);
3406 } else {
3407 $label->{fg}[3] = $item->{fg}[3] || 1;
3408 }
3409
3410 push @widgets, $label;
2849 } 3411 }
2850 3412
2851 $self->clear; 3413 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3414 $self->SUPER::add (reverse @widgets);
2853} 3415}
… …
2856 my ($self, $text, %arg) = @_; 3418 my ($self, $text, %arg) = @_;
2857 3419
2858 $text =~ s/^\s+//; 3420 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3421 $text =~ s/\s+$//;
2860 3422
3423 return unless $text;
3424
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3425 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3426
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3427 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3428
2865 if (my $item = $self->{item}{$group}) { 3429 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3430 if ($item->{text} eq $text) {
2867 $item->{count}++; 3431 $item->{count}++;
2868 } else { 3432 } else {
2869 $item->{count} = 1; 3433 $item->{count} = 1;
2870 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
2871 } 3435 }
2872 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
2873 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
2874 delete $item->{label}; 3438 delete $item->{label};
2875 } else { 3439 } else {
2876 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
2877 id => ++$self->{id}, 3441 id => ++$self->{id},
… …
2883 count => 1, 3447 count => 1,
2884 %arg, 3448 %arg,
2885 }; 3449 };
2886 } 3450 }
2887 3451
3452 $ROOT->on_refresh (reorder => sub {
2888 $self->reorder; 3453 $self->reorder;
3454 });
2889} 3455}
2890 3456
2891sub reconfigure { 3457sub reconfigure {
2892 my ($self) = @_; 3458 my ($self) = @_;
2893 3459
… …
2896 3462
2897 $self->reorder; 3463 $self->reorder;
2898 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
2899} 3465}
2900 3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
3473}
3474
2901############################################################################# 3475#############################################################################
2902 3476
2903package CFClient::UI::Root; 3477package CFClient::UI::Inventory;
2904 3478
2905our @ISA = CFClient::UI::Container::; 3479our @ISA = CFClient::UI::Table::;
2906
2907use CFClient::OpenGL;
2908 3480
2909sub new { 3481sub new {
2910 my $class = shift; 3482 my $class = shift;
2911 3483
2912 $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0],
3486 @_,
3487 );
3488
3489 $self
3490}
3491
3492sub set_items {
3493 my ($self, $items) = @_;
3494
3495 $self->clear;
3496 return unless $items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::SpellList;
3520
3521our @ISA = CFClient::UI::Table::;
3522
3523sub new {
3524 my $class = shift;
3525
3526 my $self = $class->SUPER::new (
3527 binding => [],
3528 commands => [],
2913 @_, 3529 @_,
2914 ) 3530 )
2915} 3531}
2916 3532
2917sub configure { 3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2918 my ($self, $x, $y, $w, $h) = @_;
2919 3534
2920 $self->{w} = $w; 3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2921 $self->{h} = $h; 3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2922} 3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2923 3545
2924sub check_size { 3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3618sub add_spell {
2925 my ($self) = @_; 3619 my ($self, $spell) = @_;
2926 3620
2927 $self->size_allocate ($self->{w}, $self->{h}) 3621 $self->{spell}->{$spell->{name}} = $spell;
2928 if $self->{w}; 3622 $self->rebuild_spell_list;
3623}
3624
3625sub remove_spell {
3626 my ($self, $spell) = @_;
3627
3628 delete $self->{spell}->{$spell->{name}};
3629 $self->rebuild_spell_list;
3630}
3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3639#############################################################################
3640
3641package CFClient::UI::Root;
3642
3643our @ISA = CFClient::UI::Container::;
3644
3645use List::Util qw(min max);
3646
3647use CFClient::OpenGL;
3648
3649sub new {
3650 my $class = shift;
3651
3652 my $self = $class->SUPER::new (
3653 visible => 1,
3654 @_,
3655 );
3656
3657 Scalar::Util::weaken ($self->{root} = $self);
3658
3659 $self
2929} 3660}
2930 3661
2931sub size_request { 3662sub size_request {
2932 my ($self) = @_; 3663 my ($self) = @_;
2933 3664
2934 ($self->{w}, $self->{h}) 3665 ($self->{w}, $self->{h})
2935} 3666}
2936 3667
3668sub _to_pixel {
3669 my ($coord, $size, $max) = @_;
3670
3671 $coord =
3672 $coord eq "center" ? ($max - $size) * 0.5
3673 : $coord eq "max" ? $max
3674 : $coord;
3675
3676 $coord = 0 if $coord < 0;
3677 $coord = $max - $size if $coord > $max - $size;
3678
3679 int $coord + 0.5
3680}
3681
2937sub size_allocate { 3682sub invoke_size_allocate {
2938 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
2939
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945 3684
2946 for my $child ($self->children) { 3685 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3686 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3687
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3688 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3689 $Y = $child->{force_y} if exists $child->{force_y};
2951 3690
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3691 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3693
2958 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
2959 } 3695 }
3696
3697 1
2960} 3698}
2961 3699
2962sub coord2local { 3700sub coord2local {
2963 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
2964 3702
… …
2972} 3710}
2973 3711
2974sub update { 3712sub update {
2975 my ($self) = @_; 3713 my ($self) = @_;
2976 3714
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3715 $::WANT_REFRESH++;
2979} 3716}
2980 3717
2981sub add { 3718sub add {
2982 my ($self, @children) = @_; 3719 my ($self, @children) = @_;
2983 3720
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3721 $_->{is_toplevel} = 1
2986 3722 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3723
2992 $self->SUPER::add (@children); 3724 $self->SUPER::add (@children);
3725}
3726
3727sub remove {
3728 my ($self, @children) = @_;
3729
3730 $self->SUPER::remove (@children);
3731
3732 delete $self->{is_toplevel}
3733 for @children;
3734
3735 while (@children) {
3736 my $w = pop @children;
3737 push @children, $w->children;
3738 $w->set_invisible;
3739 }
2993} 3740}
2994 3741
2995sub on_refresh { 3742sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3743 my ($self, $id, $cb) = @_;
2997 3744
… …
3010 while ($self->{refresh_hook}) { 3757 while ($self->{refresh_hook}) {
3011 $_->() 3758 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3759 for values %{delete $self->{refresh_hook}};
3013 } 3760 }
3014 3761
3015 if ($self->{check_size}) { 3762 if ($self->{realloc}) {
3016 my @queue = ([], []); 3763 my %queue;
3764 my @queue;
3765 my $widget;
3017 3766
3018 for (;;) { 3767 outer:
3019 if ($self->{check_size}) { 3768 while () {
3020 # heuristic: check containers last 3769 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3770 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3771 $widget->{visible} or next; # do not resize invisible widgets
3772
3773 $queue{$widget+0}++ and next; # duplicates are common
3774
3775 push @{ $queue[$widget->{visible}] }, $widget;
3776 }
3023 } 3777 }
3024 3778
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3779 while () {
3780 @queue or last outer;
3026 3781
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3782 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3783 and last;
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034 3784
3785 pop @queue;
3786 }
3787
3788 delete $queue{$widget+0};
3789
3790 my ($w, $h) = $widget->size_request;
3791
3792 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3793 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3794
3795 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3796 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3797
3798 $w = $widget->{force_w} if exists $widget->{force_w};
3799 $h = $widget->{force_h} if exists $widget->{force_h};
3800
3801 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3802 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3803 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3804 $widget->{req_h} = $h;
3037 3805
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3806 $self->{size_alloc}{$widget+0} = $widget;
3039 3807
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3808 if (my $parent = $widget->{parent}) {
3809 $self->{realloc}{$parent+0} = $parent
3810 unless $queue{$parent+0};
3811
3812 $parent->{force_size_alloc} = 1;
3813 $self->{size_alloc}{$parent+0} = $parent;
3814 }
3042 } 3815 }
3816
3817 delete $self->{realloc}{$widget+0};
3043 } 3818 }
3044 } 3819 }
3045 3820
3046 while ($self->{size_alloc}) { 3821 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3822 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3823 values %$size_alloc;
3824
3825 while () {
3826 my $widget = pop @queue || last;
3827
3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3829
3050 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3052 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3839 $w = int $w + 0.5;
3840 $h = int $h + 0.5;
3841
3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3843 $widget->{old_w} = $widget->{w};
3844 $widget->{old_h} = $widget->{h};
3845
3053 $widget->{w} = $w; 3846 $widget->{w} = $w;
3054 $widget->{h} = $h; 3847 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3848
3056 $widget->emit (size_allocate => $w, $h); 3849 $widget->emit (size_allocate => $w, $h);
3850 }
3057 } 3851 }
3058 } 3852 }
3059 3853
3060 while ($self->{post_alloc_hook}) { 3854 while ($self->{post_alloc_hook}) {
3061 $_->() 3855 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3856 for values %{delete $self->{post_alloc_hook}};
3063 } 3857 }
3858
3064 3859
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3860 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3862 glClear GL_COLOR_BUFFER_BIT;
3068 3863
… …
3070 glLoadIdentity; 3865 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3867 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3868 glLoadIdentity;
3074 3869
3870 {
3871 package CFClient::UI::Base;
3872
3873 ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h});
3875 }
3876
3075 $self->_draw; 3877 $self->_draw;
3076} 3878}
3077 3879
3078############################################################################# 3880#############################################################################
3079 3881

Diff Legend

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