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

Diff Legend

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