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

Diff Legend

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