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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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