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.469 by root, Fri Sep 19 01:23:36 2008 UTC

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

Diff Legend

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