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

Diff Legend

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