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

Diff Legend

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