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

Diff Legend

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