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

Diff Legend

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