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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.428 by root, Mon Aug 20 19:24:22 2007 UTC

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

Diff Legend

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