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

Diff Legend

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