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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.444 by root, Sat Dec 8 18:38:13 2007 UTC

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

Diff Legend

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