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

Diff Legend

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