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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines