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.60 by root, Tue Apr 11 13:14:36 2006 UTC vs.
Revision 1.84 by root, Wed Apr 12 12:20:00 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
79} 100}
80 101
81sub move { 102sub move {
82 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 104 $self->{x} = $x;
… …
92sub size_request { 113sub size_request {
93 require Carp; 114 require Carp;
94 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
95} 116}
96 117
97sub size_allocate { 118sub _size_allocate {
98 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
99 125
100 $self->{w} = $w; 126 $self->{w} = $w;
101 $self->{h} = $h; 127 $self->{h} = $h;
102}
103 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
104# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
105sub translate { 139sub translate {
106 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
107 141
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109} 143}
110 144
111sub focus_in { 145sub focus_in {
112 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
113 149
114 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 151 $focus->update if $focus;
116 $FOCUS->update; 152 $FOCUS->update;
117} 153}
… …
125 $focus->update if $focus; #? 161 $focus->update if $focus; #?
126} 162}
127 163
128sub mouse_motion { } 164sub mouse_motion { }
129sub button_up { } 165sub button_up { }
130sub button_down { }
131sub key_down { } 166sub key_down { }
132sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
133 174
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 180
140sub draw { 181sub draw {
141 my ($self) = @_; 182 my ($self) = @_;
142 183
184 return unless $self->{h} && $self->{w};
185
143 glPushMatrix; 186 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
146 if ($self == $HOVER) { 191 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 197 glBegin GL_QUADS;
150 glVertex 0 , 0; 198 glVertex $x , $y;
151 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
154 glEnd; 202 glEnd;
155 glDisable GL_BLEND; 203 glDisable GL_BLEND;
156 } 204 }
157 glPopMatrix;
158} 205}
159 206
160sub _draw { 207sub _draw {
161 my ($self) = @_; 208 my ($self) = @_;
162 209
163 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 211}
176 212
177sub find_widget { 213sub find_widget {
178 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
179 215
… …
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 219
184 () 220 ()
185} 221}
186 222
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 223sub set_parent {
190 my ($self, $par) = @_; 224 my ($self, $par) = @_;
191 225
192 $self->{parent} = $par; 226 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
202 236
203 $self->{parent}->update 237 $self->{parent}->update
204 if $self->{parent}; 238 if $self->{parent};
205} 239}
206 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
207sub DESTROY { 254sub DESTROY {
208 my ($self) = @_; 255 my ($self) = @_;
209 256
210 #$self->deactivate; 257 #$self->deactivate;
211} 258}
212 259
213############################################################################# 260#############################################################################
214 261
215package CFClient::Widget::Container; 262package CFClient::UI::DrawBG;
216 263
217our @ISA = CFClient::Widget::; 264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
218 268
219sub new { 269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
314package CFClient::UI::Container;
315
316our @ISA = CFClient::UI::Base::;
317
318sub new {
220 my ($class, @widgets) = @_; 319 my ($class, %arg) = @_;
221 320
321 my $children = delete $arg{children} || [];
322
222 my $self = $class->SUPER::new (children => []); 323 my $self = $class->SUPER::new (children => [], %arg);
223 $self->add ($_) for @widgets; 324 $self->add ($_) for @$children;
224 325
225 $self 326 $self
226} 327}
227 328
228sub add { 329sub add {
229 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
230 331
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self); 332 $chld->set_parent ($self);
233 333
234 @{$self->{children}} = 334 $self->{children} = [
235 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
237 338
238 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
239 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
240} 341}
241 342
242sub remove { 343sub remove {
243 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
244 345
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246 347
247 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
248} 349}
249 350
250sub find_widget { 351sub find_widget {
251 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
252 353
… …
269 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
270} 371}
271 372
272############################################################################# 373#############################################################################
273 374
274package CFClient::Widget::Bin; 375package CFClient::UI::Bin;
275 376
276our @ISA = CFClient::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
378
379sub new {
380 my ($class, %arg) = @_;
381
382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
383
384 $class->SUPER::new (children => [$child], %arg)
385}
386
387sub add {
388 my ($self, $widget) = @_;
389
390 $self->{children} = [];
391
392 $self->SUPER::add ($widget);
393}
394
395sub remove {
396 my ($self, $widget) = @_;
397
398 $self->SUPER::remove ($widget);
399
400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
277 403
278sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
279 405
280sub size_request { 406sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
282} 408}
283 409
284sub size_allocate { 410sub size_allocate {
285 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
286 412
287 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
288 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
289 if $self->{children}[0]
290} 416}
291 417
292############################################################################# 418#############################################################################
293 419
294package CFClient::Widget::Window; 420package CFClient::UI::Window;
295 421
296our @ISA = CFClient::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
297 423
298use SDL::OpenGL; 424use SDL::OpenGL;
299 425
300sub new { 426sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 427 my ($class, %arg) = @_;
302 428
303 my $self = $class->SUPER::new; 429 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 430}
307 431
308sub update { 432sub update {
309 my ($self) = @_; 433 my ($self) = @_;
310 434
435 # we want to do this delayed...
311 $self->render_chld; 436 $self->render_chld;
312 $self->SUPER::update; 437 $self->SUPER::update;
313} 438}
314 439
315sub render_chld { 440sub render_chld {
… …
320 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
321 ); 446 );
322} 447}
323 448
324sub size_allocate { 449sub size_allocate {
325 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
326 451
327 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
328 $self->{h} = $h;
329 453
330 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
331 455
332 $self->render_chld; 456 $self->render_chld;
333} 457}
334 458
335sub _draw { 459sub _draw {
… …
339 463
340 my $tex = $self->{texture} 464 my $tex = $self->{texture}
341 or return; 465 or return;
342 466
343 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
344 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
346 471
347 $tex->draw_quad (0, 0, $w, $h); 472 $tex->draw_quad (0, 0, $w, $h);
348 473
… …
350 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
351} 476}
352 477
353############################################################################# 478#############################################################################
354 479
355package CFClient::Widget::Frame; 480package CFClient::UI::Frame;
356 481
357our @ISA = CFClient::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
358 483
359use SDL::OpenGL; 484use SDL::OpenGL;
360 485
361sub size_request { 486sub size_request {
362 my ($self) = @_; 487 my ($self) = @_;
… …
367 492
368 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
369} 494}
370 495
371sub size_allocate { 496sub size_allocate {
372 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
373 498
374 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
375 $self->{h} = $h;
376 500
377 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
378 $self->child->move (2, 2);
379} 502}
380 503
381sub _draw { 504sub _draw {
382 my ($self) = @_; 505 my ($self) = @_;
383 506
… …
396 $chld->draw; 519 $chld->draw;
397} 520}
398 521
399############################################################################# 522#############################################################################
400 523
401package CFClient::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
402 525
403our @ISA = CFClient::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
404 527
405use SDL::OpenGL; 528use SDL::OpenGL;
406 529
407my @tex = 530my @tex =
408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 533
411sub size_request { 534sub size_request {
412 my ($self) = @_; 535 my ($self) = @_;
413 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
414 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
415 540
416 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
417 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
418 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
419 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
420 545
421 ($w, $h) 546 ($w, $h)
422} 547}
423 548
424sub size_allocate { 549sub size_allocate {
425 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
426 551
427 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
428 553
429 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
430 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
431 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
432 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
433 558
434 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
435 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
436 561
437 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
439} 613}
440 614
441sub _draw { 615sub _draw {
442 my ($self) = @_; 616 my ($self) = @_;
443 617
444 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446 620
447 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
451 625
452 my $top = $tex[1]; 626 my $top = $tex[1];
453 $top->draw_quad (0, 0, $w, $top->{height}); 627 $top->draw_quad (0, 0, $w, $top->{h});
454 628
455 my $left = $tex[3]; 629 my $left = $tex[3];
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
457 631
458 my $right = $tex[2]; 632 my $right = $tex[2];
459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
460 634
461 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
463 637
464 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
465 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 642
470 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
471 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
472 645
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
474 647
648 glDisable GL_TEXTURE_2D;
475 glDisable GL_BLEND; 649 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477 650
478 $self->child->draw; 651 $self->child->draw;
479 652
480} 653}
481 654
482############################################################################# 655#############################################################################
483 656
484package CFClient::Widget::Table; 657package CFClient::UI::Table;
485 658
486our @ISA = CFClient::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
487 662
488use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
489 673
490sub add { 674sub add {
491 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493 676
494 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
496 $self->update; 681 $self->update;
497} 682}
498 683
499sub max_row_height { 684sub get_wh {
500 my ($self, $row) = @_; 685 my ($self) = @_;
501 686
502 my $hs = 0; 687 my (@w, @h);
503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
504 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
505 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
506 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
507 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
508 } 700 }
509 } 701 }
510 return $hs;
511}
512 702
513sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
514 my ($self, $col) = @_; 707 my ($self) = @_;
515 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
516 my $ws = 0; 742 my $x = 0;
517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
518 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
519 if ($c) { 745 for my $c (0 .. $#$row) {
520 my ($w, $h) = $c->size_request; 746 my $col_w = $ws->[$c];
521 if ($ws < $w) { $ws = $w } 747
748 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
751
752 $x += $col_w;
522 } 753 }
754
755 $y += $row_h;
523 } 756 }
524 return $ws; 757
525} 758}
759
760sub find_widget {
761 my ($self, $x, $y) = @_;
762
763 $x -= $self->{x};
764 $y -= $self->{y};
765
766 my $res;
767
768 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
769 $res = $_->find_widget ($x, $y)
770 and return $res;
771 }
772
773 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
774}
775
776sub _draw {
777 my ($self) = @_;
778
779 for (grep $_, @{$self->{children}}) {
780 $_->draw for grep $_, @$_;
781 }
782}
783
784#############################################################################
785
786package CFClient::UI::HBox;
787
788# TODO: wrap into common Box base class
789
790our @ISA = CFClient::UI::Container::;
526 791
527sub size_request { 792sub size_request {
528 my ($self) = @_; 793 my ($self) = @_;
529 794
795 my @alloc = map [$_->size_request], @{$self->{children}};
796
797 (
798 (List::Util::sum map $_->[0], @alloc),
799 (List::Util::max map $_->[1], @alloc),
800 )
801}
802
803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h) or return;
807
808 return unless $self->{w};
809
530 my ($hs, $ws) = (0, 0); 810 ($h, $w) = ($w, $h);
531 811
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my $children = $self->{children};
533 $hs += $self->max_row_height ($yi);
534 }
535 813
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 814 my @h = map +($_->size_request)[0], @$children;
537 my $wm = 0; 815
538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 816 my $req_h = List::Util::sum @h;
539 $wm += $self->max_col_width ($xi) 817
818 if ($req_h > $h) {
819 # ah well, not enough space
820 $_ *= $h / $req_h for @h;
821 } else {
822 my $exp = List::Util::sum map $_->{expand}, @$children;
823 $exp ||= 1;
824
825 for (0 .. $#$children) {
826 my $child = $children->[$_];
827
828 my $alloc_h = $h[$_];
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h;
540 } 831 }
541 if ($ws < $wm) { $ws = $wm }
542 } 832 }
543
544 return ($ws, $hs);
545}
546
547sub _draw {
548 my ($self) = @_;
549 833
550 my $y = 0; 834 my $y = 0;
551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 835 for (0 .. $#$children) {
836 my $child = $children->[$_];
552 my $x = 0; 837 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w);
553 839
554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 840 $y += $h;
555
556 my $c = $self->{children}->[$yi]->[$xi];
557 if ($c) {
558 $c->move ($x, $y, 0); #TODO: Move to size_request
559 $c->draw if $c;
560 }
561
562 $x += $self->max_col_width ($xi);
563 }
564
565 $y += $self->max_row_height ($yi);
566 } 841 }
567} 842}
568 843
569############################################################################# 844#############################################################################
570 845
571package CFClient::Widget::VBox; 846package CFClient::UI::VBox;
572 847
848# TODO: wrap into common Box base class
849
573our @ISA = CFClient::Widget::Container::; 850our @ISA = CFClient::UI::Container::;
574
575use SDL::OpenGL;
576 851
577sub size_request { 852sub size_request {
578 my ($self) = @_; 853 my ($self) = @_;
579 854
580 my @alloc = map [$_->size_request], @{$self->{children}}; 855 my @alloc = map [$_->size_request], @{$self->{children}};
… …
584 (List::Util::sum map $_->[1], @alloc), 859 (List::Util::sum map $_->[1], @alloc),
585 ) 860 )
586} 861}
587 862
588sub size_allocate { 863sub size_allocate {
589 my ($self, $w, $h) = @_; 864 my ($self, $x, $y, $w, $h) = @_;
590 865
591 $self->w ($w); 866 $self->_size_allocate ($x, $y, $w, $h) or return;
592 $self->h ($h);
593 867
594 my $exp; 868 return unless $self->{h};
595 my @oth; 869
596 # find expand widget 870 my $children = $self->{children};
597 for (@{$self->{children}}) { 871
598 if ($_->{expand}) { 872 my @h = map +($_->size_request)[1], @$children;
873
874 my $req_h = List::Util::sum @h;
875
876 if ($req_h > $h) {
877 # ah well, not enough space
878 $_ *= $h / $req_h for @h;
879 } else {
880 my $exp = List::Util::sum map $_->{expand}, @$children;
599 $exp = $_; 881 $exp ||= 1;
600 last; 882
883 for (0 .. $#$children) {
884 my $child = $children->[$_];
885
886 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
601 } 887 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
609 my ($w, $h) = $_->size_request;
610 $oh += $h;
611 if ($ow < $w) { $ow = $w }
612 } 888 }
613 889
614 my $y = 0; 890 my $y = 0;
615 for (@{$self->{children}}) { 891 for (0 .. $#$children) {
616 $_->move (0, $y); 892 my $child = $children->[$_];
617 893 my $h = $h[$_];
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h); 894 $child->size_allocate (0, $y, $w, $h);
895
624 $y += $h; 896 $y += $h;
625 }
626 } 897 }
627} 898}
628 899
629############################################################################# 900#############################################################################
630 901
631package CFClient::Widget::Label; 902package CFClient::UI::Label;
632 903
633our @ISA = CFClient::Widget::; 904our @ISA = CFClient::UI::Base::;
634 905
635use SDL::OpenGL; 906use SDL::OpenGL;
636 907
637sub new { 908sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 909 my ($class, %arg) = @_;
639 910
640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new ( 911 my $self = $class->SUPER::new (
644 x => $x, 912 fg => [1, 1, 1],
645 y => $y, 913 height => $::FONTSIZE,
646 z => $z, 914 text => "",
647 height => $height, 915 align => -1,
916 padding => 2,
648 layout => new CFClient::Layout, 917 layout => new CFClient::Layout,
918 %arg
649 ); 919 );
650 920
651 $self->set_text ($text); 921 $self->set_text ($self->{text});
652 922
653 $self 923 $self
924}
925
926sub escape_text {
927 local $_ = $_[1];
928
929 s/&/&amp;/g;
930 s/>/&gt;/g;
931 s/</&lt;/g;
932
933 $_[1]
654} 934}
655 935
656sub set_text { 936sub set_text {
657 my ($self, $text) = @_; 937 my ($self, $text) = @_;
658 938
659 $self->{text} = $text; 939 $self->{text} = $text;
660 $self->{layout}->set_markup ($text); 940 $self->{layout}->set_markup ($text);
661 941
662 delete $self->{texture}; 942 delete $self->{texture};
943# $self->{w} = $self->{h} = -1;
944 $self->update;
663} 945}
664 946
665sub get_text { 947sub get_text {
666 my ($self, $text) = @_; 948 my ($self, $text) = @_;
667 949
… …
670 952
671sub size_request { 953sub size_request {
672 my ($self) = @_; 954 my ($self) = @_;
673 955
674 $self->{layout}->set_width; 956 $self->{layout}->set_width;
957 $self->{layout}->set_height ($self->{height});
675 $self->{layout}->size 958 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 959
677# ( 960 (
678# $self->{texture}{width}, 961 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 962 $h + $self->{padding} * 2,
680# ) 963 )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 964}
687 965
688sub size_allocate { 966sub size_allocate {
689 my ($self, $w, $h) = @_; 967 my ($self, $x, $y, $w, $h) = @_;
690 968
691 $self->SUPER::size_allocate ($w, $h); 969 $self->_size_allocate ($x, $y, $w, $h) or return;
970
692 delete $self->{texture}; 971 delete $self->{texture};
972}
973
974sub update {
975 my ($self) = @_;
976
977 delete $self->{texture};
978 $self->SUPER::update;
693} 979}
694 980
695sub _draw { 981sub _draw {
696 my ($self) = @_; 982 my ($self) = @_;
697 983
698 my $tex = $self->{texture} ||= do { 984 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 985 $self->{layout}->set_width ($self->{w});
986 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
700 new_from_layout CFClient::Texture $self->{layout}; 987 new_from_layout CFClient::Texture $self->{layout}
701 }; 988 };
702 989
703 glEnable GL_BLEND; 990 glEnable GL_BLEND;
991 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 992 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
707 994
708 glColor 1, 0, 0, 1; # TODO color 995 glColor @{$self->{fg}};
709 996
997 my $x =
998 $self->{align} < 0 ? $self->{padding}
999 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000 : ($self->{w} - $tex->{w}) * 0.5;
1001
1002 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
710 $tex->draw_quad (0, 0); 1003 $tex->draw_quad (0, 0);
711 1004
1005 glDisable GL_TEXTURE_2D;
712 glDisable GL_BLEND; 1006 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D;
714} 1007}
715 1008
716############################################################################# 1009#############################################################################
717 1010
718package CFClient::Widget::Entry; 1011package CFClient::UI::Entry;
719 1012
720our @ISA = CFClient::Widget::Label::; 1013our @ISA = CFClient::UI::Label::;
721 1014
722use SDL; 1015use SDL;
723use SDL::OpenGL; 1016use SDL::OpenGL;
724 1017
1018sub new {
1019 my $class = shift;
1020
1021 $class->SUPER::new (
1022 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0],
1026 @_
1027 )
1028}
1029
1030sub _set_text {
1031 my ($self, $text) = @_;
1032
1033 $self->{last_activity} = $::NOW;
1034
1035 $self->{text} = $text;
1036 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1038
1039 $text =~ s/./*/g if $self->{hidden};
1040
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042
1043 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text;
1045
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1047}
1048
1049sub size_request {
1050 my ($self) = @_;
1051
1052 my ($w, $h) = $self->SUPER::size_request;
1053
1054 ($w + 1, $h) # add 1 for cursor
1055}
1056
1057sub size_allocate {
1058 my ($self, $x, $y, $w, $h) = @_;
1059
1060 $self->SUPER::size_allocate ($x, $y, $w, $h);
1061
1062 $self->_set_text ($self->{text});
1063}
1064
1065sub set_text {
1066 my ($self, $text) = @_;
1067
1068 $self->{cursor} = length $text;
1069 $self->_set_text ($text);
1070 $self->update;
1071}
1072
725sub key_down { 1073sub key_down {
726 my ($self, $ev) = @_; 1074 my ($self, $ev) = @_;
727 1075
728 my $mod = $ev->key_mod; 1076 my $mod = $ev->key_mod;
729 my $sym = $ev->key_sym; 1077 my $sym = $ev->key_sym;
… …
731 my $uni = $ev->key_unicode; 1079 my $uni = $ev->key_unicode;
732 1080
733 my $text = $self->get_text; 1081 my $text = $self->get_text;
734 1082
735 if ($sym == SDLK_BACKSPACE) { 1083 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, ''; 1084 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1085 } elsif ($sym == SDLK_DELETE) {
1086 substr $text, $self->{cursor}, 1, "";
1087 } elsif ($sym == SDLK_LEFT) {
1088 --$self->{cursor} if $self->{cursor};
1089 } elsif ($sym == SDLK_RIGHT) {
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text;
737 } elsif ($uni) { 1095 } elsif ($uni) {
738 $text .= chr $uni; 1096 substr $text, $self->{cursor}++, 0, chr $uni;
739 } 1097 }
740 1098
741 $self->set_text ($text); 1099 $self->_set_text ($text);
1100 $self->update;
1101}
1102
1103sub focus_in {
1104 my ($self) = @_;
1105
1106 $self->{last_activity} = $::NOW;
1107
1108 $self->SUPER::focus_in;
742} 1109}
743 1110
744sub button_down { 1111sub button_down {
745 my ($self, $ev) = @_; 1112 my ($self, $ev, $x, $y) = @_;
746 1113
747 $self->focus_in; 1114 $self->SUPER::button_down ($ev, $x, $y);
1115
1116 my $idx = $self->{layout}->xy_to_index ($x, $y);
1117
1118 # byte-index to char-index
1119 my $text = $self->{text};
1120 utf8::encode $text;
1121 $self->{cursor} = length substr $text, 0, $idx;
1122
1123 $self->_set_text ($self->{text});
1124 $self->update;
748} 1125}
749 1126
750sub mouse_motion { 1127sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_; 1128 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1129# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753} 1130}
754 1131
755sub _draw { 1132sub _draw {
756 my ($self) = @_; 1133 my ($self) = @_;
757 1134
1135 local $self->{fg} = $self->{fg};
1136
758 if ($FOCUS == $self) { 1137 if ($FOCUS == $self) {
759 glColor 1, 1, 1; 1138 glColor @{$self->{active_bg}};
1139 $self->{fg} = $self->{active_fg};
760 } else { 1140 } else {
761 glColor 0.7, 0.7, 0.7; 1141 glColor @{$self->{bg}};
762 } 1142 }
763 1143
1144 glEnable GL_BLEND;
1145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
764 glBegin GL_QUADS; 1146 glBegin GL_QUADS;
765 glVertex 0 , 0; 1147 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1; 1148 glVertex 0 , $self->{h};
767 glVertex $self->{w} - 1, $self->{h} - 1; 1149 glVertex $self->{w}, $self->{h};
768 glVertex $self->{w} - 1, 0; 1150 glVertex $self->{w}, 0;
769 glEnd; 1151 glEnd;
1152 glDisable GL_BLEND;
770 1153
771 $self->SUPER::_draw; 1154 $self->SUPER::_draw;
772}
773 1155
774############################################################################# 1156 #TODO: force update every cursor change :(
1157 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1158 glColor @{$self->{fg}};
1159 glBegin GL_LINES;
1160 glVertex $self->{cur_x}, $self->{cur_y};
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd;
1163 }
1164}
775 1165
776package CFClient::Widget::MapWidget; 1166#############################################################################
777 1167
778use strict; 1168package CFClient::UI::Button;
779 1169
780use List::Util qw(min max); 1170our @ISA = CFClient::UI::Label::;
781 1171
782use SDL; 1172use SDL;
783use SDL::OpenGL; 1173use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785 1174
1175sub new {
1176 my $class = shift;
1177
1178 $class->SUPER::new (
1179 padding => 4,
1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0],
1184 border_fg => [1, 1, 0],
1185 @_
1186 )
1187}
1188
1189sub button_up {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) {
1194 $self->emit ("activate");
1195 }
1196}
1197
1198sub _draw {
1199 my ($self) = @_;
1200
1201 local $self->{fg} = $self->{fg};
1202
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1207
1208 glBegin GL_LINE_LOOP;
1209 glColor @{$self->{border_fg}};
1210 glVertex 1 , 1;
1211 glVertex 1 , $self->{h} - 2;
1212 glVertex $self->{w} - 2, $self->{h} - 2;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd;
1215
1216 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 }
1222
1223 glBegin GL_QUADS;
1224 glVertex 2 , 2;
1225 glVertex 2 , $self->{h} - 2;
1226 glVertex $self->{w} - 2, $self->{h} - 2;
1227 glVertex $self->{w} - 2, 2;
1228 glEnd;
1229 glDisable GL_BLEND;
1230
1231 $self->SUPER::_draw;
1232}
1233
1234#############################################################################
1235
1236package CFClient::UI::Slider;
1237
1238use strict;
1239
1240use SDL::OpenGL;
1241
1242our @ISA = CFClient::UI::DrawBG::;
1243
1244sub new {
1245 my $class = shift;
1246
1247 # range [value, low, high, page]
1248
1249 my $self = $class->SUPER::new (
1250 fg => [1, 1, 1],
1251 active_fg => [0, 0, 0],
1252 range => [0, 0, 100, 10],
1253 req_w => 40,
1254 req_h => 10,
1255 vertical => 0,
1256 @_
1257 );
1258
1259 $self
1260}
1261
1262sub size_request {
1263 my ($self) = @_;
1264
1265 my $w = $self->{req_w};
1266 my $h = $self->{req_h};
1267
1268 $self->{vertical} ? ($h, $w) : ($w, $h)
1269}
1270
1271sub button_down {
1272 my ($self, $ev, $x, $y) = @_;
1273
1274 $self->SUPER::button_down ($ev, $x, $y);
1275 $self->mouse_motion ($ev, $x, $y);
1276}
1277
1278sub mouse_motion {
1279 my ($self, $ev, $x, $y) = @_;
1280
1281 if ($GRAB == $self) {
1282 my ($value, $lo, $hi, $page) = @{$self->{range}};
1283
1284 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1285
1286 $x = $x * ($hi - $lo) / $w + $lo;
1287 $x = $lo if $x < $lo;
1288 $x = $hi - $page if $x > $hi - $page;
1289 $self->{range}[0] = $x;
1290
1291 $self->emit (changed => $x);
1292 $self->update;
1293 }
1294}
1295
1296sub _draw {
1297 my ($self) = @_;
1298
1299 $self->SUPER::_draw ();
1300
1301 my ($w, $h) = @$self{qw(w h)};
1302
1303 if ($self->{vertical}) {
1304 # draw a vertical slider like a rotated horizontal slider
1305
1306 glRotate 90, 0, 0, 1;
1307 glTranslate 0, -$self->{w}, 0;
1308
1309 ($w, $h) = ($h, $w);
1310 }
1311
1312 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314
1315 my ($value, $lo, $hi, $page) = @{$self->{range}};
1316
1317 $page = int $page * $w / ($hi - $lo);
1318 $value = int +($value - $lo) * $w / ($hi - $lo);
1319
1320 $w -= $page;
1321 $page &= ~1;
1322 glTranslate $page * 0.5, 0, 0;
1323 $page ||= 2;
1324
1325 glColor @$fg;
1326 glBegin GL_LINES;
1327 glVertex 0, 0; glVertex 0, $h;
1328 glVertex $w - 1, 0; glVertex $w - 1, $h;
1329 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1330 glEnd;
1331
1332 my $knob_a = $value - $page * 0.5;
1333 my $knob_b = $value + $page * 0.5;
1334
1335 glBegin GL_QUADS;
1336 glColor @$fg;
1337 glVertex $knob_a, 0;
1338 glVertex $knob_a, $h;
1339 glVertex $knob_b, $h;
1340 glVertex $knob_b, 0;
1341
1342 if ($knob_a < $knob_b - 2) {
1343 glColor @$bg;
1344 glVertex $knob_a + 1, 1;
1345 glVertex $knob_a + 1, $h - 1;
1346 glVertex $knob_b - 1, $h - 1;
1347 glVertex $knob_b - 1, 1;
1348 }
1349 glEnd;
1350}
1351
1352#############################################################################
1353
1354package CFClient::UI::MapWidget;
1355
1356use strict;
1357
1358use List::Util qw(min max);
1359
1360use SDL;
1361use SDL::OpenGL;
1362
786our @ISA = CFClient::Widget::; 1363our @ISA = CFClient::UI::Base::;
1364
1365sub new {
1366 my $class = shift;
1367
1368 $class->SUPER::new (
1369 z => -1,
1370 list => (glGenLists 1),
1371 @_
1372 )
1373}
787 1374
788sub key_down { 1375sub key_down {
789 print "MAPKEYDOWN\n"; 1376 print "MAPKEYDOWN\n";
790} 1377}
791 1378
792sub key_up { 1379sub key_up {
793} 1380}
794 1381
795sub size_request { 1382sub size_request {
796 ( 1383 (
797 1 + int $::WIDTH / 32, 1384 1 + 32 * int $::WIDTH / 32,
798 1 + int $::HEIGHT / 32, 1385 1 + 32 * int $::HEIGHT / 32,
799 ) 1386 )
800} 1387}
801 1388
1389sub update {
1390 my ($self) = @_;
1391
1392 $self->{need_update} = 1;
1393 $self->SUPER::update;
1394}
1395
802sub _draw { 1396sub draw {
803 my ($self) = @_; 1397 my ($self) = @_;
804 1398
1399 if (delete $self->{need_update}) {
1400 glNewList $self->{list}, GL_COMPILE;
1401
805 my $mx = $::CONN->{mapx}; 1402 my $mx = $::CONN->{mapx};
806 my $my = $::CONN->{mapy}; 1403 my $my = $::CONN->{mapy};
807 1404
808 my $map = $::CONN->{map}; 1405 my $map = $::CONN->{map};
809 1406
810 my ($xofs, $yofs); 1407 my ($xofs, $yofs);
811 1408
812 my $sw = 1 + int $::WIDTH / 32; 1409 my $sw = 1 + int $::WIDTH / 32;
813 my $sh = 1 + int $::HEIGHT / 32; 1410 my $sh = 1 + int $::HEIGHT / 32;
814 1411
815 if ($::CONN->{mapw} > $sw) { 1412 if ($::CONN->{mapw} > $sw) {
816 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1413 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
817 } else { 1414 } else {
818 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1415 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
819 } 1416 }
820 1417
821 if ($::CONN->{maph} > $sh) { 1418 if ($::CONN->{maph} > $sh) {
822 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1419 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
823 } else { 1420 } else {
824 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1421 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
825 } 1422 }
826 1423
827 glEnable GL_TEXTURE_2D; 1424 glEnable GL_TEXTURE_2D;
828 glEnable GL_BLEND; 1425 glEnable GL_BLEND;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
830 1428
831 my $sw4 = ($sw + 3) & ~3; 1429 my $sw4 = ($sw + 3) & ~3;
832 my $darkness = "\x00" x ($sw4 * $sh); 1430 my $darkness = "\x00" x ($sw4 * $sh);
833 1431
834 for my $x (0 .. $sw - 1) { 1432 for my $x (0 .. $sw - 1) {
835 my $row = $map->[$x + $xofs]; 1433 my $row = $map->[$x + $xofs];
836 for my $y (0 .. $sh - 1) { 1434 for my $y (0 .. $sh - 1) {
837 1435
838 my $cell = $row->[$y + $yofs] 1436 my $cell = $row->[$y + $yofs]
839 or next; 1437 or next;
840 1438
841 my $dark = $cell->[0]; 1439 my $dark = $cell->[0];
842 if ($dark < 0) { 1440 if ($dark < 0) {
843 substr $darkness, $y * $sw4 + $x, 1, chr 224; 1441 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else { 1442 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; 1443 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
846 } 1444 }
847 1445
848 for my $num (grep $_, @$cell[1,2,3]) { 1446 for my $num (grep $_, @$cell[1,2,3]) {
849 my $tex = $::CONN->{face}[$num]{texture} || next; 1447 my $tex = $::CONN->{face}[$num]{texture} || next;
850 1448
851 my $w = $tex->{width}; 1449 my ($w, $h) = @$tex{qw(w h)};
852 my $h = $tex->{height};
853 1450
854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1451 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1452 }
855 } 1453 }
856 } 1454 }
857 }
858 1455
859# if (1) { # higher quality darkness 1456# if (1) { # higher quality darkness
860# $lighting =~ s/(.)/$1$1$1/gs; 1457# $lighting =~ s/(.)/$1$1$1/gs;
861# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1458# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
862# 1459#
… …
864# 1461#
865# $lighting = $pb->get_pixels; 1462# $lighting = $pb->get_pixels;
866# $lighting =~ s/(.)../$1/gs; 1463# $lighting =~ s/(.)../$1/gs;
867# } 1464# }
868 1465
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871 1467
872 $darkness = new CFClient::Texture 1468 $darkness = new CFClient::Texture
873 width => $sw4, 1469 w => $sw4,
874 height => $sh, 1470 h => $sh,
875 data => $darkness, 1471 data => $darkness,
876 internalformat => GL_ALPHA, 1472 internalformat => GL_ALPHA,
877 format => GL_ALPHA; 1473 format => GL_ALPHA;
878 1474
879 glColor 0.45, 0.45, 0.45, 1; 1475 glColor 0.45, 0.45, 0.45, 1;
880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1476 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
881 1477
882 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND; 1479 glDisable GL_BLEND;
1480
1481 glEndList;
1482 }
1483
1484 glCallList $self->{list};
884} 1485}
885 1486
886my %DIR = ( 1487my %DIR = (
887 SDLK_KP8, [1, "north"], 1488 SDLK_KP8, [1, "north"],
888 SDLK_KP9, [2, "northeast"], 1489 SDLK_KP9, [2, "northeast"],
… …
934 } 1535 }
935} 1536}
936 1537
937############################################################################# 1538#############################################################################
938 1539
939package CFClient::Widget::Animator; 1540package CFClient::UI::Animator;
940 1541
941use SDL::OpenGL; 1542use SDL::OpenGL;
942 1543
943our @ISA = CFClient::Widget::Bin::; 1544our @ISA = CFClient::UI::Bin::;
944 1545
945sub moveto { 1546sub moveto {
946 my ($self, $x, $y) = @_; 1547 my ($self, $x, $y) = @_;
947 1548
948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
976 glPopMatrix; 1577 glPopMatrix;
977} 1578}
978 1579
979############################################################################# 1580#############################################################################
980 1581
981package CFClient::Widget::Toplevel; 1582package CFClient::UI::Toplevel;
982 1583
983our @ISA = CFClient::Widget::Container::; 1584our @ISA = CFClient::UI::Container::;
984 1585
985sub size_request { 1586sub size_request {
986 ($::WIDTH, $::HEIGHT) 1587 ($::WIDTH, $::HEIGHT)
987} 1588}
988 1589
989sub size_allocate { 1590sub size_allocate {
990 my ($self, $w, $h) = @_; 1591 my ($self, $x, $y, $w, $h) = @_;
991 1592
992 $self->SUPER::size_allocate ($w, $h); 1593 $self->_size_allocate ($x, $y, $w, $h);
993 1594
994 $_->size_allocate ($_->size_request) 1595 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
995 for @{$self->{children}}; 1596 for @{$self->{children}};
996} 1597}
997 1598
998sub translate { 1599sub translate {
999 my ($self, $x, $y) = @_; 1600 my ($self, $x, $y) = @_;
… …
1002} 1603}
1003 1604
1004sub update { 1605sub update {
1005 my ($self) = @_; 1606 my ($self) = @_;
1006 1607
1007 $self->size_allocate ($self->size_request); 1608 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1008 ::refresh (); 1609 ::refresh ();
1009} 1610}
1010 1611
1011sub add { 1612sub add {
1012 my ($self, $widget) = @_; 1613 my ($self, $widget) = @_;
1013 1614
1014 $self->SUPER::add ($widget); 1615 $self->SUPER::add ($widget);
1015 1616
1016 $widget->size_allocate ($widget->size_request); 1617 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1017} 1618}
1018 1619
1019sub draw { 1620sub draw {
1020 my ($self) = @_; 1621 my ($self) = @_;
1021 1622
1022 $self->_draw; 1623 $self->_draw;
1023} 1624}
1024 1625
1025############################################################################# 1626#############################################################################
1026 1627
1027package CFClient::Widget; 1628package CFClient::UI;
1028 1629
1029$TOPLEVEL = new CFClient::Widget::Toplevel; 1630$TOPLEVEL = new CFClient::UI::Toplevel;
1030 1631
10311 16321
1032 1633

Diff Legend

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