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

Diff Legend

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