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

Diff Legend

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