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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 2006 UTC

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

Diff Legend

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