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.216 by root, Fri May 19 16:43:57 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) = @_;
… …
136 $rem += $_ - $i; 152 $rem += $_ - $i;
137 $_ = $i; 153 $_ = $i;
138 } 154 }
139} 155}
140 156
157sub full_refresh {
158 # make a copy, otherwise for complains about freed values.
159 my @widgets = values %WIDGET;
160
161 $_->update
162 for @widgets;
163}
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
141# call when resolution changes etc. 173# call when resolution changes etc.
142sub rescale_widgets { 174sub rescale_widgets {
143 my ($sx, $sy) = @_; 175 my ($sx, $sy) = @_;
144 176
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 177 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 192 }
159
160 $widget->reconfigure;
161 } 193 }
194
195 reconfigure_widgets;
162} 196}
163 197
164############################################################################# 198#############################################################################
165 199
166package CFClient::UI::Base; 200package CFClient::UI::Base;
… …
171 205
172sub new { 206sub new {
173 my $class = shift; 207 my $class = shift;
174 208
175 my $self = bless { 209 my $self = bless {
176 x => 0, 210 x => "center",
177 y => 0, 211 y => "center",
178 z => 0, 212 z => 0,
213 w => undef,
214 h => undef,
179 can_events => 1, 215 can_events => 1,
180 @_ 216 @_
181 }, $class; 217 }, $class;
182 218
219 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
220
183 for (keys %$self) { 221 for (keys %$self) {
184 if (/^connect_(.*)$/) { 222 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 223 $self->connect ($1 => delete $self->{$_});
186 } 224 }
187 } 225 }
188 226
189 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 }
190 238
191 $self 239 $self
192} 240}
193 241
194sub destroy { 242sub destroy {
… …
204 return if $self->{parent}; 252 return if $self->{parent};
205 253
206 $CFClient::UI::ROOT->add ($self); 254 $CFClient::UI::ROOT->add ($self);
207} 255}
208 256
209sub hide { 257sub set_visible {
210 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};
211 281
212 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 314 $self->{parent}->remove ($self)
216 if $self->{parent}; 315 if $self->{parent};
217} 316}
218 317
219sub move { 318sub move_abs {
220 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
221 320
222 $self->{x} = int $x; 321 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
223 $self->{y} = int $y; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
224 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
225 324
226 $self->update; 325 $self->update;
227} 326}
228 327
229sub set_size { 328sub set_size {
230 my ($self, $w, $h) = @_; 329 my ($self, $w, $h) = @_;
231 330
232 $self->{user_w} = $w; 331 $self->{force_w} = $w;
233 $self->{user_h} = $h; 332 $self->{force_h} = $h;
234 333
235 $self->check_size; 334 $self->realloc;
236} 335}
237 336
238sub size_request { 337sub size_request {
239 require Carp; 338 require Carp;
240 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
241} 340}
242 341
342sub baseline_shift {
343 0
344}
345
243sub configure { 346sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
245 348
246 if ($self->{aspect}) { 349 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h);
351
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 352 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 353 $h = List::Util::min $h, int $w / $self->{aspect};
249 354
250 # use alignment to adjust x, y 355 # use alignment to adjust x, y
251 356
252 $x += int +($w - $w2) * 0.5; 357 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 358 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 359 }
257 360
258 if ($self->{x} != $x || $self->{y} != $y) { 361 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 362 $self->{x} = $x;
260 $self->{y} = $y; 363 $self->{y} = $y;
261 $self->update; 364 $self->update;
262 } 365 }
263 366
264 if ($self->{w} != $w || $self->{h} != $h) { 367 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 368 return unless $self->{visible};
266 }
267}
268 369
269sub size_allocate { 370 $self->{alloc_w} = $w;
270 # nothing to be done 371 $self->{alloc_h} = $h;
271}
272 372
273sub reconfigure { 373 $self->{root}{size_alloc}{$self+0} = $self;
274 my ($self) = @_; 374 }
275
276 $self->check_size (1);
277 $self->update;
278} 375}
279 376
280sub children { 377sub children {
378 # nop
379}
380
381sub visible_children {
382 $_[0]->children
281} 383}
282 384
283sub set_max_size { 385sub set_max_size {
284 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
285 387
286 delete $self->{max_w}; $self->{max_w} = $w if $w; 388 $self->{max_w} = int $w if defined $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 389 $self->{max_h} = int $h if defined $h;
390
391 $self->realloc;
288} 392}
289 393
290sub set_tooltip { 394sub set_tooltip {
291 my ($self, $tooltip) = @_; 395 my ($self, $tooltip) = @_;
292 396
397 $tooltip =~ s/^\s+//;
398 $tooltip =~ s/\s+$//;
399
400 return if $self->{tooltip} eq $tooltip;
401
293 $self->{tooltip} = $tooltip; 402 $self->{tooltip} = $tooltip;
294 403
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 404 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 405 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 406 $CFClient::UI::TOOLTIP_WATCHER->cb->();
298 } 407 }
299} 408}
300 409
301# translate global coordinates to local coordinate system 410# translate global coordinates to local coordinate system
302sub coord2local { 411sub coord2local {
… …
310 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
311 420
312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
313} 422}
314 423
315sub focus_in { 424sub invoke_focus_in {
316 my ($self) = @_; 425 my ($self) = @_;
317 426
318 return if $FOCUS == $self; 427 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
320 429
321 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
322 431
323 $self->emit (focus_in => $focus); 432 $self->update;
324 433
325 $focus->update if $focus; 434 0
326 $FOCUS->update;
327} 435}
328 436
329sub focus_out { 437sub invoke_focus_out {
330 my ($self) = @_; 438 my ($self) = @_;
331 439
332 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
333 441
334 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
335 443
336 $self->emit (focus_out => $focus); 444 $self->update;
337 445
338 $focus->update if $focus; #? 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
339} 447 unless $FOCUS;
340 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
341sub mouse_motion { } 459sub invoke_mouse_motion { 0 }
342sub button_up { } 460sub invoke_button_up { 0 }
343sub key_down { } 461sub invoke_key_down { 0 }
344sub key_up { } 462sub invoke_key_up { 0 }
345 463
346sub button_down { 464sub invoke_button_down {
347 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
348 466
349 $self->focus_in; 467 $self->grab_focus;
350}
351 468
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 469 warn "button down $ev->{button} $x $y\n";#d#
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 470
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 471 0
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 472}
356sub 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
357 539
358sub draw { 540sub draw {
359 my ($self) = @_; 541 my ($self) = @_;
360 542
361 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);
362 552
363 glPushMatrix; 553 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367 555
368 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
372 glEnable GL_BLEND; 558 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
374 glBegin GL_QUADS; 560 glBegin GL_QUADS;
375 glVertex $x , $y;
376 glVertex $x + $self->{w}, $y;
377 glVertex $x + $self->{w}, $y + $self->{h};
378 glVertex $x , $y + $self->{h};
379 glEnd;
380 glDisable GL_BLEND;
381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 561 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
392 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;
393 glPopMatrix; 579 glPopMatrix;
394 #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;
395 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
396} 585}
397 586
398sub _draw { 587sub _draw {
399 my ($self) = @_; 588 my ($self) = @_;
400 589
401 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
402} 591}
403 592
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450}
451
452sub DESTROY { 593sub DESTROY {
453 my ($self) = @_; 594 my ($self) = @_;
454 595
596 return if CFClient::in_destruct;
597
455 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
456 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
457} 602}
458 603
459############################################################################# 604#############################################################################
460 605
461package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
486 631
487 if ($color && (@$color < 4 || $color->[3])) { 632 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
489 634
490 glEnable GL_BLEND; 635 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 637 glColor_premultiply @$color;
493 638
494 glBegin GL_QUADS; 639 glBegin GL_QUADS;
495 glVertex 0 , 0; 640 glVertex 0 , 0;
496 glVertex 0 , $h; 641 glVertex 0 , $h;
497 glVertex $w, $h; 642 glVertex $w, $h;
… …
512 my ($class, %arg) = @_; 657 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 658 $class->SUPER::new (can_events => 0, %arg);
514} 659}
515 660
516sub size_request { 661sub size_request {
517 (0, 0) 662 my ($self) = @_;
663
664 ($self->{w} + 0, $self->{h} + 0)
518} 665}
519 666
520sub draw { } 667sub draw { }
521 668
522############################################################################# 669#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 673our @ISA = CFClient::UI::Base::;
527 674
528sub new { 675sub new {
529 my ($class, %arg) = @_; 676 my ($class, %arg) = @_;
530 677
531 my $children = delete $arg{children} || []; 678 my $children = delete $arg{children};
532 679
533 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
534 children => [], 681 children => [],
535 can_events => 0, 682 can_events => 0,
536 %arg, 683 %arg,
537 ); 684 );
685
538 $self->add ($_) for @$children; 686 $self->add (@$children)
687 if $children;
539 688
540 $self 689 $self
541} 690}
542 691
543sub add { 692sub add {
… …
551 $self->{children} = [ 700 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 701 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 702 @{$self->{children}}, @widgets
554 ]; 703 ];
555 704
556 $self->check_size (1); 705 $self->realloc;
557 $self->update;
558} 706}
559 707
560sub children { 708sub children {
561 @{ $_[0]{children} } 709 @{ $_[0]{children} }
562} 710}
… …
567 delete $child->{parent}; 715 delete $child->{parent};
568 $child->hide; 716 $child->hide;
569 717
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 718 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 719
572 $self->check_size; 720 $self->realloc;
573 $self->update;
574} 721}
575 722
576sub clear { 723sub clear {
577 my ($self) = @_; 724 my ($self) = @_;
578 725
… …
582 for (@$children) { 729 for (@$children) {
583 delete $_->{parent}; 730 delete $_->{parent};
584 $_->hide; 731 $_->hide;
585 } 732 }
586 733
587 $self->check_size; 734 $self->realloc;
588 $self->update;
589} 735}
590 736
591sub find_widget { 737sub find_widget {
592 my ($self, $x, $y) = @_; 738 my ($self, $x, $y) = @_;
593 739
594 $x -= $self->{x}; 740 $x -= $self->{x};
595 $y -= $self->{y}; 741 $y -= $self->{y};
596 742
597 my $res; 743 my $res;
598 744
599 for (reverse @{ $self->{children} }) { 745 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 746 $res = $_->find_widget ($x, $y)
601 and return $res; 747 and return $res;
602 } 748 }
603 749
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 750 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
625} 771}
626 772
627sub add { 773sub add {
628 my ($self, $child) = @_; 774 my ($self, $child) = @_;
629 775
630 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
631
632 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
633} 778}
634 779
635sub remove { 780sub remove {
636 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
645 790
646sub size_request { 791sub size_request {
647 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
648} 793}
649 794
650sub size_allocate { 795sub invoke_size_allocate {
651 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
652 797
653 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
654} 801}
655 802
656############################################################################# 803#############################################################################
804
805# back-buffered drawing area
657 806
658package CFClient::UI::Window; 807package CFClient::UI::Window;
659 808
660our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
661 810
… …
672 821
673 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
674 $self->SUPER::update; 823 $self->SUPER::update;
675} 824}
676 825
677sub size_allocate { 826sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
679 828
680 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
682} 832}
683 833
684sub _render { 834sub _render {
835 my ($self) = @_;
836
685 $_[0]{children}[0]->draw; 837 $self->{children}[0]->draw;
686} 838}
687 839
688sub render_child { 840sub render_child {
689 my ($self) = @_; 841 my ($self) = @_;
690 842
691 $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 {
692 glClearColor 0, 0, 0, 0; 844 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 845 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 854 $self->_render;
696 }; 855 };
697} 856}
698 857
699sub _draw { 858sub _draw {
700 my ($self) = @_; 859 my ($self) = @_;
701 860
702 my ($w, $h) = ($self->w, $self->h); 861 my ($w, $h) = @$self{qw(w h)};
703 862
704 my $tex = $self->{texture} 863 my $tex = $self->{texture}
705 or return; 864 or return;
706 865
707 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 868 glColor 0, 0, 0, 1;
710 869
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
712 871
713 glDisable GL_TEXTURE_2D; 872 glDisable GL_TEXTURE_2D;
714} 873}
… …
717 876
718package CFClient::UI::ViewPort; 877package CFClient::UI::ViewPort;
719 878
720our @ISA = CFClient::UI::Window::; 879our @ISA = CFClient::UI::Window::;
721 880
881sub new {
882 my $class = shift;
883
884 $class->SUPER::new (
885 scroll_x => 0,
886 scroll_y => 1,
887 @_,
888 )
889}
890
722sub size_request { 891sub size_request {
723 my ($self) = @_; 892 my ($self) = @_;
724 893
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 894 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 895
728 @$self{qw(child_w child_h)} 896 $w = 10 if $self->{scroll_x};
729} 897 $h = 10 if $self->{scroll_y};
730 898
899 ($w, $h)
900}
901
731sub size_allocate { 902sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 911 $self->update;
912
913 1
735} 914}
736 915
737sub set_offset { 916sub set_offset {
738 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
739 918
… …
772} 951}
773 952
774sub _render { 953sub _render {
775 my ($self) = @_; 954 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 960
779 $self->SUPER::_render; 961 $self->SUPER::_render;
780} 962}
781 963
… …
784package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
785 967
786our @ISA = CFClient::UI::HBox::; 968our @ISA = CFClient::UI::HBox::;
787 969
788sub new { 970sub new {
789 my $class = shift; 971 my ($class, %arg) = @_;
972
973 my $child = delete $arg{child};
790 974
791 my $self; 975 my $self;
792 976
793 my $slider = new CFClient::UI::Slider 977 my $slider = new CFClient::UI::Slider
794 vertical => 1, 978 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 979 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 980 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 981 $self->{vp}->set_offset (0, $_[1]);
798 }, 982 },
799 ; 983 ;
800 984
801 $self = $class->SUPER::new ( 985 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 986 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 987 slider => $slider,
804 @_, 988 %arg,
805 ); 989 );
806 990
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
810 993
811 $self 994 $self
812} 995}
813 996
814#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
815# 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}
816 1034
817############################################################################# 1035#############################################################################
818 1036
819package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
820 1038
… …
836 1054
837 if ($self->{bg}) { 1055 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1056 my ($w, $h) = @$self{qw(w h)};
839 1057
840 glEnable GL_BLEND; 1058 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1060 glColor_premultiply @{ $self->{bg} };
843 1061
844 glBegin GL_QUADS; 1062 glBegin GL_QUADS;
845 glVertex 0 , 0; 1063 glVertex 0 , 0;
846 glVertex 0 , $h; 1064 glVertex 0 , $h;
847 glVertex $w, $h; 1065 glVertex $w, $h;
… …
860 1078
861our @ISA = CFClient::UI::Bin::; 1079our @ISA = CFClient::UI::Bin::;
862 1080
863use CFClient::OpenGL; 1081use CFClient::OpenGL;
864 1082
865my @tex = 1083my $bg =
1084 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1085 mipmap => 1, wrap => 1;
1086
1087my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 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);
868 1090
869sub new { 1091sub new {
870 my $class = shift; 1092 my ($class, %arg) = @_;
871
872 # TODO: user_x, user_y, overwrite moveto?
873 1093
874 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1097 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1098 can_events => 1,
880 @_ 1099 min_w => 64,
1100 min_h => 32,
1101 %arg,
881 ); 1102 );
882 1103
883 $self->{title} &&= new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
884 align => 0, 1105 align => 0,
885 valign => 1, 1106 valign => 1,
886 text => $self->{title}, 1107 text => $self->{title},
887 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 }
888 1119
889 $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};
890} 1129}
891 1130
892sub border { 1131sub border {
893 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
894} 1133}
895 1134
896sub size_request { 1135sub size_request {
897 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};
898 1143
899 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
900 1145
901 ( 1146 (
902 $w + $self->border * 2, 1147 $w + $self->border * 2,
903 $h + $self->border * 2, 1148 $h + $self->border * 2,
904 ) 1149 )
905} 1150}
906 1151
907sub size_allocate { 1152sub invoke_size_allocate {
908 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
909 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
910 $h -= List::Util::max 0, $self->border * 2; 1163 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1164 $w -= List::Util::max 0, $border * 2;
912 1165
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
917}
918 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
919sub button_down { 1182sub invoke_button_down {
920 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
921 1184
922 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
923 my $border = $self->border; 1186 my $border = $self->border;
924 1187
… …
937 my ($ev, $x, $y) = @_; 1200 my ($ev, $x, $y) = @_;
938 1201
939 my $dx = $ev->{x} - $ox; 1202 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
941 1204
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1207
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1209 $self->realloc;
946 }; 1210 };
947 1211
948 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1216 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
954 1218
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
956 1220
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1222 # HACK: the next line is required to enforce placement
1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1224 };
1225 } else {
1226 return 0;
1227 }
1228
960 } 1229 1
961} 1230}
962 1231
963sub button_up { 1232sub invoke_button_up {
964 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
965 1234
966 delete $self->{motion}; 1235 ! ! delete $self->{motion}
967} 1236}
968 1237
969sub mouse_motion { 1238sub invoke_mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
971 1240
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242
1243 ! ! $self->{motion}
973} 1244}
974 1245
975sub _draw { 1246sub _draw {
976 my ($self) = @_; 1247 my ($self) = @_;
977 1248
1249 my $child = $self->{children}[0];
1250
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1251 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1252 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1253
981 glEnable GL_TEXTURE_2D; 1254 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1256
984 my $border = $self->border; 1257 my $border = $self->border;
985 1258
986 glColor @{ $self->{border_bg} }; 1259 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1260 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1261 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1262 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1263 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1264
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1265 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1266 glColor @{ $self->{bg} };
994 1267
995 # TODO: repeat texture not scale 1268 # TODO: repeat texture not scale
1269 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1270 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1271 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1272 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1273 }
1006 1274
1007 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1008 1276
1009 $self->{title}->draw if $self->{title};
1010
1011 $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};
1012} 1288}
1013 1289
1014############################################################################# 1290#############################################################################
1015 1291
1016package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1024sub new { 1300sub new {
1025 my $class = shift; 1301 my $class = shift;
1026 1302
1027 $class->SUPER::new ( 1303 $class->SUPER::new (
1028 col_expand => [], 1304 col_expand => [],
1029 @_ 1305 @_,
1030 ) 1306 )
1307}
1308
1309sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1311}
1032 1312
1033sub add { 1313sub add {
1034 my ($self, $x, $y, $child) = @_; 1314 my ($self, $x, $y, $child) = @_;
1035 1315
1036 $child->set_parent ($self); 1316 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1038 1318
1039 $child->check_size; 1319 $self->realloc;
1040} 1320}
1041 1321
1042sub children { 1322sub remove {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1323 my ($self, $child) = @_;
1044}
1045 1324
1325 # TODO: not yet implemented
1326}
1327
1046# 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?
1047sub clear { 1329sub clear {
1048 my ($self) = @_; 1330 my ($self) = @_;
1049 1331
1050 my @children = $self->children; 1332 my @children = $self->children;
1051 delete $self->{children}; 1333 delete $self->{children};
… …
1053 for (@children) { 1335 for (@children) {
1054 delete $_->{parent}; 1336 delete $_->{parent};
1055 $_->hide; 1337 $_->hide;
1056 } 1338 }
1057 1339
1058 $self->update; 1340 $self->realloc;
1059} 1341}
1060 1342
1061sub get_wh { 1343sub get_wh {
1062 my ($self) = @_; 1344 my ($self) = @_;
1063 1345
… …
1089 (sum @$ws), 1371 (sum @$ws),
1090 (sum @$hs), 1372 (sum @$hs),
1091 ) 1373 )
1092} 1374}
1093 1375
1094sub size_allocate { 1376sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1096 1378
1097 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1098 1380
1099 my $req_w = sum @$ws; 1381 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1382 my $req_h = (sum @$hs) || 1;
1101 1383
1102 # TODO: nicer code && do row_expand 1384 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1385 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1386 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1387 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1413 }
1132 1414
1133 $y += $row_h; 1415 $y += $row_h;
1134 } 1416 }
1135 1417
1418 1
1136} 1419}
1137 1420
1138sub find_widget { 1421sub find_widget {
1139 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1140 1423
… …
1159 } 1442 }
1160} 1443}
1161 1444
1162############################################################################# 1445#############################################################################
1163 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
1164package CFClient::UI::HBox; 1507package CFClient::UI::HBox;
1165 1508
1166# TODO: wrap into common Box base class
1167
1168our @ISA = CFClient::UI::Container::; 1509our @ISA = CFClient::UI::Box::;
1169 1510
1170sub size_request { 1511sub new {
1171 my ($self) = @_; 1512 my $class = shift;
1172 1513
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1514 $class->SUPER::new (
1174 1515 vertical => 0,
1175 ( 1516 @_,
1176 (List::Util::sum map $_->[0], @alloc),
1177 (List::Util::max map $_->[1], @alloc),
1178 ) 1517 )
1179} 1518}
1180 1519
1181sub size_allocate {
1182 my ($self, $w, $h) = @_;
1183
1184 ($h, $w) = ($w, $h);
1185
1186 my $children = $self->{children};
1187
1188 my @h = map $_->{req_w}, @$children;
1189
1190 my $req_h = List::Util::sum @h;
1191
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children;
1197 $exp ||= 1;
1198
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 }
1206 }
1207
1208 CFClient::UI::harmonize \@h;
1209
1210 my $y = 0;
1211 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_];
1214 $child->configure ($y, 0, $h, $w);
1215
1216 $y += $h;
1217 }
1218
1219 1
1220}
1221
1222############################################################################# 1520#############################################################################
1223 1521
1224package CFClient::UI::VBox; 1522package CFClient::UI::VBox;
1225 1523
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1524our @ISA = CFClient::UI::Box::;
1229 1525
1230sub size_request { 1526sub new {
1231 my ($self) = @_; 1527 my $class = shift;
1232 1528
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1529 $class->SUPER::new (
1234 1530 vertical => 1,
1235 ( 1531 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1532 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1533}
1279 1534
1280############################################################################# 1535#############################################################################
1281 1536
1282package CFClient::UI::Label; 1537package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1554 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1555 layout => (new CFClient::Layout),
1301 fontsize => 1, 1556 fontsize => 1,
1302 align => -1, 1557 align => -1,
1303 valign => -1, 1558 valign => -1,
1304 padding => 2, 1559 padding_x => 2,
1560 padding_y => 2,
1305 can_events => 0, 1561 can_events => 0,
1306 %arg 1562 %arg
1307 ); 1563 );
1308 1564
1309 if (exists $self->{template}) { 1565 if (exists $self->{template}) {
… …
1336 1592
1337 delete $self->{texture}; 1593 delete $self->{texture};
1338 $self->SUPER::update; 1594 $self->SUPER::update;
1339} 1595}
1340 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1341sub set_text { 1604sub set_text {
1342 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1343 1606
1344 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1346 1609
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1349 1611
1612 delete $self->{size_req};
1613 $self->realloc;
1350 $self->update; 1614 $self->update;
1351 $self->check_size;
1352} 1615}
1353 1616
1354sub set_markup { 1617sub set_markup {
1355 my ($self, $markup) = @_; 1618 my ($self, $markup) = @_;
1356 1619
1357 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1359 1622
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1624
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1364 1626
1627 delete $self->{size_req};
1628 $self->realloc;
1365 $self->update; 1629 $self->update;
1366 $self->check_size;
1367} 1630}
1368 1631
1369sub size_request { 1632sub size_request {
1370 my ($self) = @_; 1633 my ($self) = @_;
1371 1634
1635 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1641
1378 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1379 1643
1380 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1381 $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);
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1648
1384 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1385 1650
1386 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1388 } 1656 };
1389 1657
1390 ( 1658 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1659}
1395 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1396sub size_allocate { 1665sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1398 1667
1668 delete $self->{ox};
1669
1399 delete $self->{texture}; 1670 delete $self->{texture}
1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1400} 1674}
1401 1675
1402sub set_fontsize { 1676sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1404 1678
1405 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1406 delete $self->{texture}; 1681 delete $self->{texture};
1407 1682
1408 $self->update; 1683 $self->realloc;
1409 $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;
1410} 1693}
1411 1694
1412sub _draw { 1695sub _draw {
1413 my ($self) = @_; 1696 my ($self) = @_;
1414 1697
1415 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1416 1699
1417 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1707
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1708 [$self->{layout}->size]
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1709 };
1437 1710
1438 glEnable GL_TEXTURE_2D; 1711 unless (exists $self->{ox}) {
1439 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);
1440 1715
1441 if ($tex->{format} == GL_ALPHA) { 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1442 glColor @{$self->{fg}}; 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1718 : ($self->{h} - $size->[1]) * 0.5);
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 } 1719 };
1447 1720
1448 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});
1449} 1725}
1450 1726
1451############################################################################# 1727#############################################################################
1452 1728
1453package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1466 active_fg => [0, 0, 0], 1742 active_fg => [0, 0, 0],
1467 can_hover => 1, 1743 can_hover => 1,
1468 can_focus => 1, 1744 can_focus => 1,
1469 valign => 0, 1745 valign => 0,
1470 can_events => 1, 1746 can_events => 1,
1747 #text => ...
1748 #hidden => "*",
1471 @_ 1749 @_
1472 ) 1750 )
1473} 1751}
1474 1752
1475sub _set_text { 1753sub _set_text {
… …
1477 1755
1478 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1479 1757
1480 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1481 1759
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1761 $self->{text} = $text;
1486 1762
1487 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1489 1766
1490 $self->emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1491} 1771}
1492 1772
1493sub set_text { 1773sub set_text {
1494 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1495 1775
1496 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1777 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 1778}
1501 1779
1502sub get_text { 1780sub get_text {
1503 $_[0]{text} 1781 $_[0]{text}
1504} 1782}
… …
1509 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1510 1788
1511 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1512} 1790}
1513 1791
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518}
1519
1520sub key_down { 1792sub invoke_key_down {
1521 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1522 1794
1523 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1524 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1525 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1540 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1814 $self->emit ('escape');
1543 } elsif ($uni) { 1815 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else {
1818 return 0;
1545 } 1819 }
1546 1820
1547 $self->_set_text ($text); 1821 $self->_set_text ($text);
1548 $self->update;
1549 $self->check_size;
1550}
1551 1822
1823 $self->realloc;
1824
1825 1
1826}
1827
1552sub focus_in { 1828sub invoke_focus_in {
1553 my ($self) = @_; 1829 my ($self) = @_;
1554 1830
1555 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1556 1832
1557 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1558} 1834}
1559 1835
1560sub button_down { 1836sub invoke_button_down {
1561 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1562 1838
1563 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1564 1840
1565 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1566 1842
1567 # byte-index to char-index 1843 # byte-index to char-index
1568 my $text = $self->{text}; 1844 my $text = $self->{text};
1569 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1571 1847
1572 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1573 $self->update; 1849 $self->update;
1850
1851 1
1574} 1852}
1575 1853
1576sub mouse_motion { 1854sub invoke_mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1578# 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
1579} 1859}
1580 1860
1581sub _draw { 1861sub _draw {
1582 my ($self) = @_; 1862 my ($self) = @_;
1583 1863
1584 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1585 1865
1586 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1589 } else { 1869 } else {
1590 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1591 } 1871 }
1592 1872
1593 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1596 glVertex 0 , 0; 1876 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1624 1904
1625our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1626 1906
1627use CFClient::OpenGL; 1907use CFClient::OpenGL;
1628 1908
1629sub key_down { 1909sub invoke_key_down {
1630 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1631 1911
1632 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1633 1913
1634 if ($sym == 13) { 1914 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1637 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1920 $self->emit (activate => $txt);
1640 $self->update; 1921 $self->update;
1641 1922
… …
1660 } else { 1941 } else {
1661 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1662 } 1943 }
1663 1944
1664 } else { 1945 } else {
1665 $self->SUPER::key_down ($ev); 1946 return $self->SUPER::invoke_key_down ($ev)
1947 }
1948
1666 } 1949 1
1667
1668} 1950}
1669 1951
1670############################################################################# 1952#############################################################################
1671 1953
1672package CFClient::UI::Button; 1954package CFClient::UI::Button;
… …
1681 1963
1682sub new { 1964sub new {
1683 my $class = shift; 1965 my $class = shift;
1684 1966
1685 $class->SUPER::new ( 1967 $class->SUPER::new (
1686 padding => 4, 1968 padding_x => 4,
1969 padding_y => 4,
1687 fg => [1, 1, 1], 1970 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1971 active_fg => [0, 0, 1],
1689 can_hover => 1, 1972 can_hover => 1,
1690 align => 0, 1973 align => 0,
1691 valign => 0, 1974 valign => 0,
1692 can_events => 1, 1975 can_events => 1,
1693 @_ 1976 @_
1694 ) 1977 )
1695} 1978}
1696 1979
1697sub button_up { 1980sub invoke_button_up {
1698 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1699 1982
1983 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1985 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1986
1703 } 1987 1
1704} 1988}
1705 1989
1706sub _draw { 1990sub _draw {
1707 my ($self) = @_; 1991 my ($self) = @_;
1708 1992
1709 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 1994
1715 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1718 1998
… …
1723 $self->SUPER::_draw; 2003 $self->SUPER::_draw;
1724} 2004}
1725 2005
1726############################################################################# 2006#############################################################################
1727 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
1728package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
1729 2045
1730our @ISA = CFClient::UI::DrawBG::; 2046our @ISA = CFClient::UI::DrawBG::;
1731 2047
1732my @tex = 2048my @tex =
… …
1737 2053
1738sub new { 2054sub new {
1739 my $class = shift; 2055 my $class = shift;
1740 2056
1741 $class->SUPER::new ( 2057 $class->SUPER::new (
1742 padding => 2, 2058 padding_x => 2,
2059 padding_y => 2,
1743 fg => [1, 1, 1], 2060 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2061 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2062 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2063 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2064 state => 0,
… …
1751} 2068}
1752 2069
1753sub size_request { 2070sub size_request {
1754 my ($self) = @_; 2071 my ($self) = @_;
1755 2072
1756 ($self->{padding} * 2 + 6) x 2 2073 (6) x 2
1757} 2074}
1758 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1759sub button_down { 2084sub invoke_button_down {
1760 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1761 2086
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2089 $self->toggle;
1765 $self->emit (changed => $self->{state}); 2090 } else {
2091 return 0
2092 }
2093
1766 } 2094 1
1767} 2095}
1768 2096
1769sub _draw { 2097sub _draw {
1770 my ($self) = @_; 2098 my ($self) = @_;
1771 2099
1772 $self->SUPER::_draw; 2100 $self->SUPER::_draw;
1773 2101
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2103
1776 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;
1777 2107
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2109
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2111
… …
1789package CFClient::UI::Image; 2119package CFClient::UI::Image;
1790 2120
1791our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1792 2122
1793use CFClient::OpenGL; 2123use CFClient::OpenGL;
1794use Carp qw/confess/;
1795 2124
1796our %loaded_images; 2125our %texture_cache;
1797 2126
1798sub new { 2127sub new {
1799 my $class = shift; 2128 my $class = shift;
1800 2129
1801 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
1802 2134
1803 $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";
1804 2137
1805 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1806 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;
1807 2140
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
1809 2142
1810 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813 2144
1814 $self 2145 $self
1815} 2146}
1816 2147
1817sub size_request { 2148sub size_request {
1818 my ($self) = @_; 2149 my ($self) = @_;
1819 2150
1820 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
1821} 2152}
1822 2153
1823sub _draw { 2154sub _draw {
1824 my ($self) = @_; 2155 my ($self) = @_;
1825 2156
… …
1934 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
1935 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
1936 2267
1937 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
1938 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);
1939 2273
1940 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
1941 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;
1942 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2279
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
1961 2296
1962 if ($t3) { 2297 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd; 2304 glEnd;
1970 } 2305 }
1971 2306
1972 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2045 my $self = $class->SUPER::new ( 2380 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2381 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2382 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2383 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2384 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2385 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2386 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2387 min_h => $::WIDTH / 80,
2053 vertical => 0, 2388 vertical => 0,
2054 can_hover => 1, 2389 can_hover => 1,
2055 inner_pad => .05, 2390 inner_pad => 0.02,
2056 @_ 2391 @_
2057 ); 2392 );
2058 2393
2059 $self->set_value ($self->{range}[0]); 2394 $self->set_value ($self->{range}[0]);
2060 $self->update; 2395 $self->update;
2061 2396
2062 $self 2397 $self
2063} 2398}
2064 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
2065sub set_value { 2411sub set_value {
2066 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2067 2413
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2414 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2415
2070 $hi = $lo + 1 if $hi <= $lo; 2416 $hi = $lo + 1 if $hi <= $lo;
2071 2417
2418 $page = $hi - $lo if $page > $hi - $lo;
2419
2072 $value = $lo if $value < $lo; 2420 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2421 $value = $hi - $page if $value > $hi - $page;
2074 2422
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2423 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2424 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2425
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2427
2082 if ($value != $old_value) { 2428 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2429 $self->emit (changed => $value);
… …
2086} 2432}
2087 2433
2088sub size_request { 2434sub size_request {
2089 my ($self) = @_; 2435 my ($self) = @_;
2090 2436
2091 my $w = $self->{req_w}; 2437 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2438}
2096 2439
2097sub button_down { 2440sub invoke_button_down {
2098 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2099 2442
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2102} 2448}
2103 2449
2104sub mouse_motion { 2450sub invoke_mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2106 2452
2107 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2455
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2456 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2457
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2458 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2459
2114 $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
2115 } 2465 1
2116} 2466}
2117 2467
2118sub update { 2468sub update {
2119 my ($self) = @_; 2469 my ($self) = @_;
2120 2470
2121 $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}) {
2122 $self->set_value ($self->{range}[0]); 2479 $self->set_value ($self->{range}[0]);
2123 2480
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2482 my $range = ($hi - $page - $lo) || 1e-100;
2125 2483
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2484 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2485
2128 $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;
2129 2488
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2489 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2490 $value = $value * $self->{scale} + $self->{offset};
2132 2491
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2493 $self->{knob_w} = $knob_w;
2140 }); 2494 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2495
2148 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2149 2497
2150 glScale $self->{w}, $self->{h}; 2498 glScale $self->{w}, $self->{h};
2151 2499
… …
2171 glDisable GL_TEXTURE_2D; 2519 glDisable GL_TEXTURE_2D;
2172} 2520}
2173 2521
2174############################################################################# 2522#############################################################################
2175 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
2176package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2177 2566
2178our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2179 2568
2180use CFClient::OpenGL; 2569use CFClient::OpenGL;
2181 2570
… …
2183 my $class = shift; 2572 my $class = shift;
2184 2573
2185 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2186 fontsize => 1, 2575 fontsize => 1,
2187 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2188 #font => default_font 2578 #font => default_font
2189 @_, 2579 @_,
2190 2580
2191 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2192 par => [], 2582 par => [],
2193 height => 0, 2583 height => 0,
2194 children => [ 2584 children => [
2195 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2196 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2207 2597
2208 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2599 $self->reflow;
2210} 2600}
2211 2601
2212sub text_height { 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
2611sub invoke_size_allocate {
2612 my ($self, $w, $h) = @_;
2613
2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2616
2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2619 $self->{layout}->set_width ($empty->{w});
2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2621
2622 $self->reflow;
2623
2624 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2213 my ($self, $text) = @_; 2629 my ($self, $para) = @_;
2214 2630
2215 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2216 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2219 $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}}
2220 2644 );
2221 ($layout->size)[1] 2645
2646 $layout
2222} 2647}
2223 2648
2224sub reflow { 2649sub reflow {
2225 my ($self) = @_; 2650 my ($self) = @_;
2226 2651
2227 $self->{need_reflow}++; 2652 $self->{need_reflow}++;
2228 $self->update; 2653 $self->update;
2229} 2654}
2230 2655
2231sub size_allocate { 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 {
2232 my ($self, $w, $h) = @_; 2664 my ($self) = @_;
2233 2665
2234 $self->SUPER::size_allocate ($w, $h); 2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2235 2668
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2669 $self->{par} = [];
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2670 $self->{height} = 0;
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2239
2240 $self->reflow;
2241} 2672}
2242 2673
2243sub add_paragraph { 2674sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2245 2676
2246 #TODO: intelligently "reformat" paragraph 2677 my ($text, @w) = ref $para ? @$para : $para;
2247 2678
2248 my $height = $self->text_height ($text); 2679 $para = {
2680 w => 1e10,
2681 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2686 };
2249 2687
2250 $self->{height} += $height; 2688 $self->add (@w) if @w;
2689 push @{$self->{par}}, $para;
2251 2690
2252 push @{$self->{par}}, [$height, $color, $text]; 2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2253 2694
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2695sub scroll_to_bottom {
2255 $self->{children}[1]->update; 2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2256} 2700}
2257 2701
2258sub update { 2702sub update {
2259 my ($self) = @_; 2703 my ($self) = @_;
2260 2704
… …
2262 2706
2263 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2264 2708
2265 delete $self->{texture}; 2709 delete $self->{texture};
2266 2710
2267 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713
2268 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2715 my $height = 0;
2270 2716
2271 $height += $_->[0] = $self->text_height ($_->[2])
2272 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 }
2273 2729
2274 $self->{height} = $height; 2730 $self->{height} = $height;
2275 2731
2276 $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]);
2277 2733
2278 delete $self->{texture}; 2734 delete $self->{texture};
2279 } 2735 }
2280 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2742 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2284 2744
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2289 2746
2290 my $y0 = $top; 2747 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2748 my $y1 = $top + $H;
2292 2749
2293 my $y = 0; 2750 my $y = 0;
2294 2751
2295 my $layout = $self->{layout};
2296
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
2299 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2300 my $h = $par->[0]; 2753 my $h = $para->{h};
2301 2754
2302 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2304 $layout->set_markup ($par->[2]);
2305 2756
2306 my ($W, $H) = $layout->size; 2757 my $layout = $self->get_layout ($para);
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2758
2759 $layout->render ($para->{indent}, $y - $y0);
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 }
2308 } 2773 }
2309 2774
2310 $y += $h; 2775 $y += $h;
2311 } 2776 }
2312
2313 glDisable GL_TEXTURE_2D;
2314 }; 2777 };
2315 }); 2778 });
2316} 2779}
2317 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2318sub _draw { 2790sub _draw {
2319 my ($self) = @_; 2791 my ($self) = @_;
2320 2792
2321 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2324 $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});
2325 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2326 2798
2327 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2328
2329} 2800}
2330 2801
2331############################################################################# 2802#############################################################################
2332 2803
2333package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2378 2849
2379sub new { 2850sub new {
2380 my $class = shift; 2851 my $class = shift;
2381 2852
2382 my $self = $class->SUPER::new ( 2853 my $self = $class->SUPER::new (
2383 state => 0, 2854 state => 0,
2384 connect_activate => \&toggle_flopper, 2855 on_activate => \&toggle_flopper,
2385 @_ 2856 @_
2386 ); 2857 );
2387 2858
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2859 $self
2394} 2860}
2395 2861
2396sub toggle_flopper { 2862sub toggle_flopper {
2397 my ($self) = @_; 2863 my ($self) = @_;
2398 2864
2399 # TODO: use animation 2865 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2866}
2411 2867
2412############################################################################# 2868#############################################################################
2413 2869
2414package CFClient::UI::Tooltip; 2870package CFClient::UI::Tooltip;
… …
2427} 2883}
2428 2884
2429sub set_tooltip_from { 2885sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2886 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2901 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2903 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2904 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2905 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2906 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446 2914
2447 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2448} 2916}
2449 2917
2450sub size_allocate { 2918sub invoke_size_allocate {
2451 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2452 2920
2453 $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 });
2454} 2940}
2455 2941
2456sub _draw { 2942sub _draw {
2457 my ($self) = @_; 2943 my ($self) = @_;
2458 2944
… …
2475 glVertex $w, $h; 2961 glVertex $w, $h;
2476 glVertex $w, 0; 2962 glVertex $w, 0;
2477 glEnd; 2963 glEnd;
2478 2964
2479 glTranslate 2 - 0.375, 2 - 0.375; 2965 glTranslate 2 - 0.375, 2 - 0.375;
2966
2480 $self->SUPER::_draw; 2967 $self->SUPER::_draw;
2481} 2968}
2482 2969
2483############################################################################# 2970#############################################################################
2484 2971
… …
2489use CFClient::OpenGL; 2976use CFClient::OpenGL;
2490 2977
2491sub new { 2978sub new {
2492 my $class = shift; 2979 my $class = shift;
2493 2980
2494 $class->SUPER::new ( 2981 my $self = $class->SUPER::new (
2495 aspect => 1, 2982 aspect => 1,
2983 can_events => 0,
2496 @_, 2984 @_,
2497 ) 2985 );
2986
2987 if ($self->{anim} && $self->{animspeed}) {
2988 Scalar::Util::weaken (my $widget = $self);
2989
2990 $self->{timer} = Event->timer (
2991 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992 hard => 1,
2993 interval => $self->{animspeed},
2994 cb => sub {
2995 ++$widget->{frame};
2996 $widget->update;
2997 },
2998 );
2999 }
3000
3001 $self
2498} 3002}
2499 3003
2500sub size_request { 3004sub size_request {
2501 (32, 8) 3005 (32, 8)
2502} 3006}
2503 3007
3008sub update {
3009 my ($self) = @_;
3010
3011 return unless $self->{visible};
3012
3013 $self->SUPER::update;
3014}
3015
2504sub _draw { 3016sub _draw {
2505 my ($self) = @_; 3017 my ($self) = @_;
2506 3018
2507 return unless $::CONN;#d# manage and cache textures differently 3019 return unless $::CONN;
3020
3021 my $face;
3022
3023 if ($self->{frame}) {
3024 my $anim = $::CONN->{anim}[$self->{anim}];
3025
3026 $face = $anim->[ $self->{frame} % @$anim ]
3027 if $anim && @$anim;
3028 }
3029
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 3031
2510 # TODO animation
2511 if ($tex) { 3032 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2517 } 3038 }
2518} 3039}
2519 3040
3041sub destroy {
3042 my ($self) = @_;
3043
3044 $self->{timer}->cancel
3045 if $self->{timer};
3046
3047 $self->SUPER::destroy;
3048}
3049
2520############################################################################# 3050#############################################################################
2521 3051
2522package CFClient::UI::InventoryItem; 3052package CFClient::UI::Buttonbar;
2523 3053
2524our @ISA = CFClient::UI::HBox::; 3054our @ISA = CFClient::UI::HBox::;
2525 3055
2526sub _item_to_desc { 3056# TODO: should actualyl wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669 3057
2670############################################################################# 3058#############################################################################
2671 3059
2672package CFClient::UI::Menu; 3060package CFClient::UI::Menu;
2673 3061
… …
2685 ); 3073 );
2686 3074
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2688 3076
2689 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2691 3079
2692 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2693 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 {
2694 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2695 can_hover => 1, 3097 can_hover => 1,
2696 can_events => 1, 3098 can_events => 1,
2697 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2698 } 3102 }
2699 3103
2700 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2701 3105
2702 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2714 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 3119 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2717 3121
2718 $self->show; 3122 $self->show;
2719 $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);
2720} 3124}
2721 3125
2722sub mouse_motion { 3126sub invoke_mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2724 3128
2725 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2728}
2729 3132
3133 0
3134}
3135
2730sub button_up { 3136sub invoke_button_up {
2731 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2732 3138
2733 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 3140 undef $GRAB;
2735 $self->hide; 3141 $self->hide;
2736 3142
2737 $self->emit ("popdown"); 3143 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
3145 } else {
3146 return 0
3147 }
3148
2739 } 3149 1
2740} 3150}
2741 3151
2742############################################################################# 3152#############################################################################
2743 3153
2744package CFClient::UI::Statusbox; 3154package CFClient::UI::Multiplexer;
2745 3155
2746our @ISA = CFClient::UI::VBox::; 3156our @ISA = CFClient::UI::Container::;
2747 3157
2748sub new { 3158sub new {
2749 my $class = shift; 3159 my $class = shift;
2750 3160
2751 $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 (
2752 fontsize => 0.8, 3340 fontsize => 0.8,
2753 @_, 3341 @_,
2754 ) 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
2755} 3349}
2756 3350
2757sub reorder { 3351sub reorder {
2758 my ($self) = @_; 3352 my ($self) = @_;
2759 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} };
2760 3359
2761 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 } 3362 }
2764 3363
… …
2767 my @items = sort { 3366 my @items = sort {
2768 $a->{pri} <=> $b->{pri} 3367 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id} 3368 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} }; 3369 } values %{ $self->{item} };
2771 3370
3371 $self->{timer}->interval (1);
3372
2772 my $count = 10 + 1; 3373 my $count = 10 + 1;
2773 for my $item (@items) { 3374 for my $item (@items) {
2774 last unless --$count; 3375 last unless --$count;
2775 3376
2776 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1 3379 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}" 3380 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text}; 3381 : $item->{text};
2781 3382
… …
2789 tooltip => $item->{tooltip}, 3390 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP, 3391 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67, 3392 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize}, 3393 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44, 3394 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3395 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3396 can_events => 1,
2796 can_hover => 1 3397 can_hover => 1
2797 }; 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;
2798 } 3411 }
2799 3412
2800 $self->clear; 3413 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3414 $self->SUPER::add (reverse @widgets);
2802} 3415}
… …
2805 my ($self, $text, %arg) = @_; 3418 my ($self, $text, %arg) = @_;
2806 3419
2807 $text =~ s/^\s+//; 3420 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3421 $text =~ s/\s+$//;
2809 3422
3423 return unless $text;
3424
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3425 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3426
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3427 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3428
2814 if (my $item = $self->{item}{$group}) { 3429 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3430 if ($item->{text} eq $text) {
2816 $item->{count}++; 3431 $item->{count}++;
2817 } else { 3432 } else {
2818 $item->{count} = 1; 3433 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
2820 } 3435 }
2821 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3438 delete $item->{label};
2824 } else { 3439 } else {
2825 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3441 id => ++$self->{id},
… …
2832 count => 1, 3447 count => 1,
2833 %arg, 3448 %arg,
2834 }; 3449 };
2835 } 3450 }
2836 3451
3452 $ROOT->on_refresh (reorder => sub {
2837 $self->reorder; 3453 $self->reorder;
3454 });
2838} 3455}
2839 3456
2840sub reconfigure { 3457sub reconfigure {
2841 my ($self) = @_; 3458 my ($self) = @_;
2842 3459
… …
2845 3462
2846 $self->reorder; 3463 $self->reorder;
2847 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
2848} 3465}
2849 3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
3473}
3474
2850############################################################################# 3475#############################################################################
2851 3476
2852package CFClient::UI::Root; 3477package CFClient::UI::Inventory;
2853 3478
2854our @ISA = CFClient::UI::Container::; 3479our @ISA = CFClient::UI::Table::;
2855
2856use CFClient::OpenGL;
2857 3480
2858sub new { 3481sub new {
2859 my $class = shift; 3482 my $class = shift;
2860 3483
2861 $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 => [],
2862 @_, 3529 @_,
2863 ) 3530 )
2864} 3531}
2865 3532
2866sub configure { 3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2867 my ($self, $x, $y, $w, $h) = @_;
2868 3534
2869 $self->{w} = $w; 3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2870 $self->{h} = $h; 3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2871} 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");
2872 3545
2873sub 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 {
2874 my ($self) = @_; 3619 my ($self, $spell) = @_;
2875 3620
2876 $self->size_allocate ($self->{w}, $self->{h}) 3621 $self->{spell}->{$spell->{name}} = $spell;
2877 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
2878} 3660}
2879 3661
2880sub size_request { 3662sub size_request {
2881 my ($self) = @_; 3663 my ($self) = @_;
2882 3664
2883 ($self->{w}, $self->{h}) 3665 ($self->{w}, $self->{h})
2884} 3666}
2885 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
2886sub size_allocate { 3682sub invoke_size_allocate {
2887 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894 3684
2895 for my $child ($self->children) { 3685 for my $child ($self->children) {
2896 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)};
2897 3687
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3688 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3689 $Y = $child->{force_y} if exists $child->{force_y};
2900 3690
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3691 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3693
2907 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
2908 } 3695 }
3696
3697 1
2909} 3698}
2910 3699
2911sub coord2local { 3700sub coord2local {
2912 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
2913 3702
… …
2921} 3710}
2922 3711
2923sub update { 3712sub update {
2924 my ($self) = @_; 3713 my ($self) = @_;
2925 3714
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3715 $::WANT_REFRESH++;
2928} 3716}
2929 3717
2930sub add { 3718sub add {
2931 my ($self, @children) = @_; 3719 my ($self, @children) = @_;
2932 3720
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3721 $_->{is_toplevel} = 1
2935 3722 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3723
2941 $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 }
2942} 3740}
2943 3741
2944sub on_refresh { 3742sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3743 my ($self, $id, $cb) = @_;
2946 3744
… …
2959 while ($self->{refresh_hook}) { 3757 while ($self->{refresh_hook}) {
2960 $_->() 3758 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3759 for values %{delete $self->{refresh_hook}};
2962 } 3760 }
2963 3761
2964 if ($self->{check_size}) { 3762 if ($self->{realloc}) {
2965 my @queue = ([], []); 3763 my %queue;
3764 my @queue;
3765 my $widget;
2966 3766
2967 for (;;) { 3767 outer:
2968 if ($self->{check_size}) { 3768 while () {
2969 # heuristic: check containers last 3769 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3770 for $widget (values %$realloc) {
2971 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 }
2972 } 3777 }
2973 3778
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3779 while () {
3780 @queue or last outer;
2975 3781
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3782 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3783 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 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}) {
2984 $widget->{req_w} = $w; 3803 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3804 $widget->{req_h} = $h;
2986 3805
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3806 $self->{size_alloc}{$widget+0} = $widget;
2988 3807
2989 $widget->{parent}->check_size
2990 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 }
2991 } 3815 }
3816
3817 delete $self->{realloc}{$widget+0};
2992 } 3818 }
2993 } 3819 }
2994 3820
2995 while ($self->{size_alloc}) { 3821 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3822 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 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)};
2998 3829
2999 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3001 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
3002 $widget->{w} = $w; 3846 $widget->{w} = $w;
3003 $widget->{h} = $h; 3847 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3848
3005 $widget->emit (size_allocate => $w, $h); 3849 $widget->emit (size_allocate => $w, $h);
3850 }
3006 } 3851 }
3007 } 3852 }
3008 3853
3009 while ($self->{post_alloc_hook}) { 3854 while ($self->{post_alloc_hook}) {
3010 $_->() 3855 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3856 for values %{delete $self->{post_alloc_hook}};
3012 } 3857 }
3013 3858
3859
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3860 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3862 glClear GL_COLOR_BUFFER_BIT;
3017 3863
3018 glMatrixMode GL_PROJECTION; 3864 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3865 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3867 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3868 glLoadIdentity;
3023 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
3024 $self->_draw; 3877 $self->_draw;
3025} 3878}
3026 3879
3027############################################################################# 3880#############################################################################
3028 3881

Diff Legend

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