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.24 by root, Sat Apr 8 20:25:26 2006 UTC vs.
Revision 1.67 by root, Tue Apr 11 14:36:59 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless {
23} 79 x => 0,
24 80 y => 0,
25sub activate { 81 z => 0,
26 push @ACTIVE_WIDGETS, $_[0]; 82 @_
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; 83 }, $class
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 84}
36 85
37sub move { 86sub move {
38 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 88 $self->{x} = $x;
… …
44sub needs_redraw { 93sub needs_redraw {
45 0 94 0
46} 95}
47 96
48sub size_request { 97sub size_request {
98 require Carp;
49 die "size_request is abtract"; 99 Carp::confess "size_request is abtract";
100}
101
102sub size_allocate {
103 my ($self, $w, $h) = @_;
104
105 $self->{w} = $w;
106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 114}
51 115
52sub focus_in { 116sub focus_in {
53 my ($widget) = @_; 117 my ($self) = @_;
54 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
55} 122}
56 123
57sub focus_out { 124sub focus_out {
58 my ($widget) = @_; 125 my ($self) = @_;
59}
60 126
61sub key_down { 127 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 128
65sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
67} 131}
68 132
133sub mouse_motion { }
134sub button_up { }
69sub button_down { 135sub button_down { }
70 my ($widget, $sdlev) = @_; 136sub key_down { }
71} 137sub key_up { }
72 138
73sub button_up { 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 144
83sub draw { 145sub draw {
84 my ($self) = @_; 146 my ($self) = @_;
85 147
86 glPushMatrix; 148 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
89 glPopMatrix; 162 glPopMatrix;
90} 163}
91 164
92sub _draw { 165sub _draw {
93 my ($widget) = @_; 166 my ($self) = @_;
167
168 warn "no draw defined for $self\n";
94} 169}
95 170
96sub bbox { 171sub bbox {
97 my ($widget) = @_; 172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180}
181
182sub find_widget {
183 my ($self, $x, $y) = @_;
184
185 return $self
186 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188
189 ()
190}
191
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent {
195 my ($self, $par) = @_;
196
197 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent};
199}
200
201sub get_parent {
202 $_[0]->{parent}
203}
204
205sub update {
206 my ($self) = @_;
207
208 $self->{parent}->update
209 if $self->{parent};
98} 210}
99 211
100sub DESTROY { 212sub DESTROY {
101 my ($self) = @_; 213 my ($self) = @_;
102 214
103 $self->deactivate; 215 #$self->deactivate;
104} 216}
105 217
218#############################################################################
219
220package CFClient::Widget::Empty;
221
222our @ISA = CFClient::Widget::;
223
224sub size_request {
225 (0, 0)
226}
227
228sub draw { }
229
230#############################################################################
231
106package Crossfire::Client::Widget::Container; 232package CFClient::Widget::Container;
107 233
108our @ISA = Crossfire::Client::Widget::; 234our @ISA = CFClient::Widget::;
235
236sub new {
237 my ($class, %arg) = @_;
238
239 my $children = delete $arg{children} || [];
240
241 my $self = $class->SUPER::new (children => [], %arg);
242 $self->add ($_) for @$children;
243
244 $self
245}
246
247sub add {
248 my ($self, $chld, $expand) = @_;
249
250 $chld->{expand} = $expand;
251 $chld->set_parent ($self);
252
253 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld
256 ];
257
258 $self->size_allocate ($self->{w}, $self->{h})
259 if $self->{w}; #TODO: check for "realised state"
260}
261
262sub remove {
263 my ($self, $widget) = @_;
264
265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266
267 $self->size_allocate ($self->{w}, $self->{h});
268}
269
270sub find_widget {
271 my ($self, $x, $y) = @_;
272
273 $x -= $self->{x};
274 $y -= $self->{y};
275
276 my $res;
277
278 for (reverse @{ $self->{children} }) {
279 $res = $_->find_widget ($x, $y)
280 and return $res;
281 }
282
283 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
284}
285
286sub _draw {
287 my ($self) = @_;
288
289 $_->draw for @{$self->{children}};
290}
291
292#############################################################################
293
294package CFClient::Widget::Bin;
295
296our @ISA = CFClient::Widget::Container::;
297
298sub new {
299 my ($class, %arg) = @_;
300
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
302
303 $class->SUPER::new (children => [$child], %arg)
304}
305
306sub add {
307 my ($self, $widget) = @_;
308
309 $self->{children} = [];
310
311 $self->SUPER::add ($widget);
312}
313
314sub remove {
315 my ($self, $widget) = @_;
316
317 $self->SUPER::remove ($widget);
318
319 $self->{children} = [new CFClient::Widget::Empty]
320 unless @{$self->{children}};
321}
322
323sub child { $_[0]->{children}[0] }
324
325sub size_request {
326 $_[0]{children}[0]->size_request if $_[0]{children}[0];
327}
328
329sub size_allocate {
330 my ($self, $w, $h) = @_;
331
332 $self->SUPER::size_allocate ($w, $h);
333 $self->{children}[0]->size_allocate ($w, $h)
334 if $self->{children}[0]
335}
336
337#############################################################################
338
339package CFClient::Widget::Window;
340
341our @ISA = CFClient::Widget::Bin::;
109 342
110use SDL::OpenGL; 343use SDL::OpenGL;
111 344
112sub add { $_[0]->{child} = $_[1] } 345sub new {
113sub get { $_[0]->{child} } 346 my ($class, %arg) = @_;
114 347
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 348 my $self = $class->SUPER::new (%arg);
349}
116 350
117sub _draw { die "Containers can't be drawn!" } 351sub update {
118
119package Crossfire::Client::Widget::Window;
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 352 my ($self) = @_;
127 $self->SUPER::add ($chld); 353
354 # we want to do this delayed...
128 $self->render_chld; 355 $self->render_chld;
356 $self->SUPER::update;
129} 357}
130 358
131sub render_chld { 359sub render_chld {
132 my ($self) = @_; 360 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 361
136 $self->{texture} = 362 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 363 CFClient::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 364 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 365 );
140 $self->{texture}->upload;
141} 366}
142 367
143sub size_request { 368sub size_allocate {
144 my ($self) = @_; 369 my ($self, $w, $h) = @_;
145 my $chld = $self->get 370
146 or return (0, 0); 371 $self->{w} = $w;
147 $chld->size_request 372 $self->{h} = $h;
373
374 $self->child->size_allocate ($w, $h);
375
376 $self->render_chld;
148} 377}
149 378
150sub _draw { 379sub _draw {
151 my ($self) = @_; 380 my ($self) = @_;
152 381
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 382 my ($w, $h) = ($self->w, $self->h);
383
154 my $tex = $self->{texture} 384 my $tex = $self->{texture}
155 or return; 385 or return;
156 386
157 glEnable GL_BLEND; 387 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 388 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name};
161 390
162 glColor 1, 1, 1; 391 $tex->draw_quad (0, 0, $w, $h);
163
164 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h;
168 glTexCoord 1, 0; glVertex $w, 0;
169 glEnd;
170 392
171 glDisable GL_BLEND; 393 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 394 glDisable GL_TEXTURE_2D;
173} 395}
174 396
397#############################################################################
398
175package Crossfire::Client::Widget::Frame; 399package CFClient::Widget::Frame;
176 400
177our @ISA = Crossfire::Client::Widget::Container::; 401our @ISA = CFClient::Widget::Bin::;
178 402
179use SDL::OpenGL; 403use SDL::OpenGL;
180 404
181sub size_request { 405sub size_request {
182 my ($self) = @_; 406 my ($self) = @_;
183 my $chld = $self->get 407 my $chld = $self->child
184 or return (0, 0); 408 or return (0, 0);
409
410 $chld->move (2, 2);
411
185 map { $_ + 4 } $chld->size_request; 412 map { $_ + 4 } $chld->size_request;
186} 413}
187 414
415sub size_allocate {
416 my ($self, $w, $h) = @_;
417
418 $self->{w} = $w;
419 $self->{h} = $h;
420
421 $self->child->size_allocate ($w - 4, $h - 4);
422 $self->child->move (2, 2);
423}
424
188sub _draw { 425sub _draw {
189 my ($self) = @_; 426 my ($self) = @_;
190 427
191 my $chld = $self->get; 428 my $chld = $self->child;
192 429
193 my ($w, $h) = $chld->size_request; 430 my ($w, $h) = $chld->size_request;
194 431
195 glColor 1, 0, 0;
196 glBegin GL_QUADS; 432 glBegin GL_QUADS;
197 glTexCoord 0, 0; glVertex 0 , 0; 433 glColor 0, 0, 0;
434 glVertex 0 , 0;
198 glTexCoord 0, 1; glVertex 0 , $h + 4; 435 glVertex 0 , $h + 4;
199 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 436 glVertex $w + 4 , $h + 4;
200 glTexCoord 1, 0; glVertex $w + 4 , 0; 437 glVertex $w + 4 , 0;
201 glEnd; 438 glEnd;
202 439
203 glPushMatrix;
204 glTranslate (2, 2, 0);
205 $chld->draw; 440 $chld->draw;
206 glPopMatrix;
207} 441}
208 442
443#############################################################################
444
445package CFClient::Widget::FancyFrame;
446
447our @ISA = CFClient::Widget::Bin::;
448
449use SDL::OpenGL;
450
451my @tex =
452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
454
455sub size_request {
456 my ($self) = @_;
457
458 my ($w, $h) = $self->SUPER::size_request;
459
460 $h += $tex[1]->{height};
461 $h += $tex[4]->{height};
462 $w += $tex[2]->{width};
463 $w += $tex[3]->{width};
464
465 ($w, $h)
466}
467
468sub size_allocate {
469 my ($self, $w, $h) = @_;
470
471 $self->SUPER::size_allocate ($w, $h);
472
473 $h -= $tex[1]->{height};
474 $h -= $tex[4]->{height};
475 $w -= $tex[2]->{width};
476 $w -= $tex[3]->{width};
477
478 $h = $h < 0 ? 0 : $h;
479 $w = $w < 0 ? 0 : $w;
480
481 my $child = $self->child;
482
483 $child->size_allocate ($w, $h);
484 $child->move ($tex[3]->{width}, $tex[1]->{height});
485}
486
487sub _draw {
488 my ($self) = @_;
489
490 my ($w, $h) = ($self->{w}, $self->{h});
491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492
493 glEnable GL_BLEND;
494 glEnable GL_TEXTURE_2D;
495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
497
498 my $top = $tex[1];
499 $top->draw_quad (0, 0, $w, $top->{height});
500
501 my $left = $tex[3];
502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
503
504 my $right = $tex[2];
505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
506
507 my $bottom = $tex[4];
508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
509
510 my $bg = $tex[0];
511 glBindTexture GL_TEXTURE_2D, $bg->{name};
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515
516 my $rep_x = $cw / $bg->{width};
517 my $rep_y = $ch / $bg->{height};
518
519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
520
521 glDisable GL_BLEND;
522 glDisable GL_TEXTURE_2D;
523
524 $self->child->draw;
525
526}
527
528#############################################################################
529
209package Crossfire::Client::Widget::Table; 530package CFClient::Widget::Table;
210 531
211our @ISA = Crossfire::Client::Widget::Container::; 532our @ISA = CFClient::Widget::Bin::;
212 533
213use SDL::OpenGL; 534use SDL::OpenGL;
214 535
215sub add { 536sub add {
216 my ($self, $x, $y, $chld) = @_; 537 my ($self, $x, $y, $chld) = @_;
538 my $old_chld = $self->{children}[$y][$x];
539
217 $self->{childs}[$y][$x] = $chld; 540 $self->{children}[$y][$x] = $chld;
541 $chld->set_parent ($self);
542 $self->update;
218} 543}
219 544
220sub max_row_height { 545sub max_row_height {
221 my ($self, $row) = @_; 546 my ($self, $row) = @_;
222 547
223 my $hs = 0; 548 my $hs = 0;
224 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
225 my $c = $self->{childs}->[$row]->[$xi]; 550 my $c = $self->{children}->[$row]->[$xi];
226 if ($c) { 551 if ($c) {
227 my ($w, $h) = $c->size_request; 552 my ($w, $h) = $c->size_request;
228 if ($hs < $h) { $hs = $h } 553 if ($hs < $h) { $hs = $h }
229 } 554 }
230 } 555 }
… …
233 558
234sub max_col_width { 559sub max_col_width {
235 my ($self, $col) = @_; 560 my ($self, $col) = @_;
236 561
237 my $ws = 0; 562 my $ws = 0;
238 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
239 my $c = ($self->{childs}->[$yi] || [])->[$col]; 564 my $c = ($self->{children}->[$yi] || [])->[$col];
240 if ($c) { 565 if ($c) {
241 my ($w, $h) = $c->size_request; 566 my ($w, $h) = $c->size_request;
242 if ($ws < $w) { $ws = $w } 567 if ($ws < $w) { $ws = $w }
243 } 568 }
244 } 569 }
… …
248sub size_request { 573sub size_request {
249 my ($self) = @_; 574 my ($self) = @_;
250 575
251 my ($hs, $ws) = (0, 0); 576 my ($hs, $ws) = (0, 0);
252 577
253 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
254 $hs += $self->max_row_height ($yi); 579 $hs += $self->max_row_height ($yi);
255 } 580 }
256 581
257 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
258 my $wm = 0; 583 my $wm = 0;
259 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
260 $wm += $self->max_col_width ($xi) 585 $wm += $self->max_col_width ($xi)
261 } 586 }
262 if ($ws < $wm) { $ws = $wm } 587 if ($ws < $wm) { $ws = $wm }
263 } 588 }
264 589
… …
267 592
268sub _draw { 593sub _draw {
269 my ($self) = @_; 594 my ($self) = @_;
270 595
271 my $y = 0; 596 my $y = 0;
272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
273 my $x = 0; 598 my $x = 0;
274 599
275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
276 601
277 glPushMatrix;
278 glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved
279 my $c = $self->{childs}->[$yi]->[$xi]; 602 my $c = $self->{children}->[$yi]->[$xi];
603 if ($c) {
604 $c->move ($x, $y, 0); #TODO: Move to size_request
280 $c->draw if $c; 605 $c->draw if $c;
281 glPopMatrix; 606 }
282 607
283 $x += $self->max_col_width ($xi); 608 $x += $self->max_col_width ($xi);
284 } 609 }
285 610
286 $y += $self->max_row_height ($yi); 611 $y += $self->max_row_height ($yi);
287 } 612 }
288} 613}
289 614
615#############################################################################
616
290package Crossfire::Client::Widget::VBox; 617package CFClient::Widget::VBox;
291 618
292our @ISA = Crossfire::Client::Widget::Container::; 619our @ISA = CFClient::Widget::Container::;
293 620
294use SDL::OpenGL; 621use SDL::OpenGL;
295 622
296sub add {
297 my ($self, $chld) = @_;
298 push @{$self->{childs}}, $chld;
299}
300
301sub size_request { 623sub size_request {
302 my ($self) = @_; 624 my ($self) = @_;
303 625
304 my ($hs, $ws) = (0, 0); 626 my @alloc = map [$_->size_request], @{$self->{children}};
627
628 (
629 (List::Util::max map $_->[0], @alloc),
630 (List::Util::sum map $_->[1], @alloc),
631 )
632}
633
634sub size_allocate {
635 my ($self, $w, $h) = @_;
636
637 $self->w ($w);
638 $self->h ($h);
639
640 my $exp;
641 my @oth;
642 # find expand widget
305 for (@{$self->{childs} || []}) { 643 for (@{$self->{children}}) {
644 if ($_->{expand}) {
645 $exp = $_;
646 last;
647 }
648 push @oth, $_;
649 }
650
651 my ($ow, $oh);
652
653 # get sizes of other widgets
654 for (@oth) {
306 my ($w, $h) = $_->size_request; 655 my ($w, $h) = $_->size_request;
307 $hs += $h; 656 $oh += $h;
308 if ($ws < $w) { $ws = $w } 657 if ($ow < $w) { $ow = $w }
309 } 658 }
310 659
311 return ($ws, $hs); 660 my $y = 0;
312}
313
314sub _draw {
315 my ($self) = @_;
316
317 my ($x, $y);
318 for (@{$self->{childs} || []}) { 661 for (@{$self->{children}}) {
319 glPushMatrix; 662 $_->move (0, $y);
320 glTranslate (0, $y, 0);# see above TODO 663
321 $_->draw; 664 if ($_ == $exp) {
322 glPopMatrix; 665 $_->size_allocate ($w, $h - $oh);
666 $y += $h - $oh;
667 } else {
323 my ($w, $h) = $_->size_request; 668 my ($cw, $h) = $_->size_request;
669 $_->size_allocate ($w, $h);
324 $y += $h; 670 $y += $h;
671 }
325 } 672 }
326} 673}
327 674
675#############################################################################
676
328package Crossfire::Client::Widget::Label; 677package CFClient::Widget::Label;
329 678
330our @ISA = Crossfire::Client::Widget::; 679our @ISA = CFClient::Widget::;
331 680
332use SDL::OpenGL; 681use SDL::OpenGL;
333 682
334sub new { 683sub new {
335 my ($class, $x, $y, $z, $ttf, $text) = @_; 684 my ($class, %arg) = @_;
336 685
337 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 686 # TODO: color, and make height, xyz etc. optional
687 my $self = $class->SUPER::new (
688 color => [1, 1, 1],
689 height => $::FONTSIZE,
690 text => "",
691 layout => new CFClient::Layout,
692 %arg
693 );
338 694
339 $self->set_text ($text); 695 $self->set_text ($self->{text});
340 696
341 $self 697 $self
342} 698}
343 699
344sub set_text { 700sub set_text {
345 my ($self, $text) = @_; 701 my ($self, $text) = @_;
346 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 702
703 $self->{text} = $text;
704 $self->{layout}->set_markup ($text);
705
706 delete $self->{texture};
347} 707}
348 708
349sub get_text { 709sub get_text {
350 my ($self, $text) = @_; 710 my ($self, $text) = @_;
711
351 $self->{text} 712 $self->{text}
352} 713}
353 714
354sub size_request { 715sub size_request {
355 my ($self) = @_; 716 my ($self) = @_;
356 717
357 ( 718 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
722# (
358 $self->{texture}{width}, 723# $self->{texture}{width},
359 $self->{texture}{height}, 724# $self->{texture}{height},
360 ) 725# )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731}
732
733sub size_allocate {
734 my ($self, $w, $h) = @_;
735
736 $self->SUPER::size_allocate ($w, $h);
737 delete $self->{texture};
361} 738}
362 739
363sub _draw { 740sub _draw {
364 my ($self) = @_; 741 my ($self) = @_;
365 742
366 my $tex = $self->{texture}; 743 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w});
745 new_from_layout CFClient::Texture $self->{layout};
746 };
367 747
368 glEnable GL_BLEND; 748 glEnable GL_BLEND;
369 glEnable GL_TEXTURE_2D; 749 glEnable GL_TEXTURE_2D;
750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
371 glBindTexture GL_TEXTURE_2D, $tex->{name};
372 752
373 glColor 1, 1, 1; 753 glColor @{$self->{color}};
374 754
375 glBegin GL_QUADS; 755 $tex->draw_quad (0, 0);
376 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $tex->{height};
378 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
379 glTexCoord 1, 0; glVertex $tex->{width}, 0;
380 glEnd;
381 756
382 glDisable GL_BLEND; 757 glDisable GL_BLEND;
383 glDisable GL_TEXTURE_2D; 758 glDisable GL_TEXTURE_2D;
384} 759}
385 760
386package Crossfire::Client::Widget::TextView; 761#############################################################################
762
763package CFClient::Widget::Entry;
764
765our @ISA = CFClient::Widget::Label::;
766
767use SDL;
768use SDL::OpenGL;
769
770sub key_down {
771 my ($self, $ev) = @_;
772
773 my $mod = $ev->key_mod;
774 my $sym = $ev->key_sym;
775
776 my $uni = $ev->key_unicode;
777
778 my $text = $self->get_text;
779
780 if ($sym == SDLK_BACKSPACE) {
781 substr $text, -1, 1, '';
782 } elsif ($uni) {
783 $text .= chr $uni;
784 }
785
786 $self->set_text ($text);
787}
788
789sub button_down {
790 my ($self, $ev) = @_;
791
792 $self->focus_in;
793}
794
795sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798}
799
800sub _draw {
801 my ($self) = @_;
802
803 if ($FOCUS == $self) {
804 glColor 1, 1, 1;
805 } else {
806 glColor 0.7, 0.7, 0.7;
807 }
808
809 glBegin GL_QUADS;
810 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1;
812 glVertex $self->{w} - 1, $self->{h} - 1;
813 glVertex $self->{w} - 1, 0;
814 glEnd;
815
816 $self->SUPER::_draw;
817}
818
819#############################################################################
820
821package CFClient::Widget::MapWidget;
387 822
388use strict; 823use strict;
389 824
390our @ISA = qw/Crossfire::Client::Widget/; 825use List::Util qw(min max);
391
392use SDL::OpenGL;
393use SDL::OpenGL::Constants;
394
395sub add_line {
396 my ($self, $line) = @_;
397 push @{$self->{lines}}, $line;
398}
399
400sub _draw {
401 my ($self) = @_;
402
403}
404
405package Crossfire::Client::Widget::MapWidget;
406
407use strict;
408
409our @ISA = qw/Crossfire::Client::Widget/;
410 826
411use SDL; 827use SDL;
412use SDL::OpenGL; 828use SDL::OpenGL;
413use SDL::OpenGL::Constants; 829use SDL::OpenGL::Constants;
414 830
831our @ISA = CFClient::Widget::;
832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 z => -1,
838 list => (glGenLists 1),
839 @_
840 )
841}
842
415sub key_down { 843sub key_down {
416 print "MAPKEYDOWN\n"; 844 print "MAPKEYDOWN\n";
417} 845}
418 846
419sub key_up { 847sub key_up {
420} 848}
421 849
850sub size_request {
851 (
852 1 + int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32,
854 )
855}
856
857sub update {
858 my ($self) = @_;
859
860 $self->{need_update} = 1;
861}
862
422sub _draw { 863sub _draw {
423 my ($self) = @_; 864 my ($self) = @_;
424 865
425 glEnable GL_TEXTURE_2D; 866 if (delete $self->{need_update}) {
426 glEnable GL_BLEND; 867 glNewList $self->{list}, GL_COMPILE;
427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
428 868
869 my $mx = $::CONN->{mapx};
870 my $my = $::CONN->{mapy};
871
429 my $map = $::CONN->{map}; 872 my $map = $::CONN->{map};
430 873
431 for my $x (0 .. int $::WIDTH / 32) { 874 my ($xofs, $yofs);
432 for my $y (0 .. int $::HEIGHT / 32) {
433 875
434 my $cell = $map->[$x + $::CONN->{mapx}] 876 my $sw = 1 + int $::WIDTH / 32;
435 [$y + $::CONN->{mapy}] 877 my $sh = 1 + int $::HEIGHT / 32;
878
879 if ($::CONN->{mapw} > $sw) {
880 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
881 } else {
882 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
883 }
884
885 if ($::CONN->{maph} > $sh) {
886 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
887 } else {
888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
889 }
890
891 glEnable GL_TEXTURE_2D;
892 glEnable GL_BLEND;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894
895 my $sw4 = ($sw + 3) & ~3;
896 my $darkness = "\x00" x ($sw4 * $sh);
897
898 for my $x (0 .. $sw - 1) {
899 my $row = $map->[$x + $xofs];
900 for my $y (0 .. $sh - 1) {
901
902 my $cell = $row->[$y + $yofs]
436 or next; 903 or next;
437 904
438 my $darkness = $cell->[0] * (1 / 255); 905 my $dark = $cell->[0];
439 if ($darkness < 0) { 906 if ($dark < 0) {
440 glColor 0.3, 0.3, 0.3; 907 substr $darkness, $y * $sw4 + $x, 1, chr 224;
441 } else { 908 } else {
442 glColor $darkness, $darkness, $darkness; 909 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
443 } 910 }
444 911
445 for my $num (grep $_, @$cell[1,2,3]) { 912 for my $num (grep $_, @$cell[1,2,3]) {
446 my $tex = $::CONN->{face}[$num]{texture} || next; 913 my $tex = $::CONN->{face}[$num]{texture} || next;
447 914
448 glBindTexture GL_TEXTURE_2D, $tex->{name};
449
450 my $w = $tex->{width}; 915 my $w = $tex->{width};
451 my $h = $tex->{height}; 916 my $h = $tex->{height};
452 917
453 my $px = ($x + 1) * 32 - $w; 918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
454 my $py = ($y + 1) * 32 - $h;
455
456 glBegin GL_QUADS;
457 glTexCoord 0, 0; glVertex $px , $py;
458 glTexCoord 0, 1; glVertex $px , $py + $h;
459 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
460 glTexCoord 1, 0; glVertex $px + $w, $py;
461 glEnd; 919 }
462 } 920 }
463 } 921 }
922
923# if (1) { # higher quality darkness
924# $lighting =~ s/(.)/$1$1$1/gs;
925# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
926#
927# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
928#
929# $lighting = $pb->get_pixels;
930# $lighting =~ s/(.)../$1/gs;
464 } 931# }
465 932
933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
935
936 $darkness = new CFClient::Texture
937 width => $sw4,
938 height => $sh,
939 data => $darkness,
940 internalformat => GL_ALPHA,
941 format => GL_ALPHA;
942
943 glColor 0.45, 0.45, 0.45, 1;
944 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
945
466 glDisable GL_TEXTURE_2D; 946 glDisable GL_TEXTURE_2D;
467 glDisable GL_BLEND; 947 glDisable GL_BLEND;
948
949 glEndList;
950 }
951
952 glCallList $self->{list};
468} 953}
469 954
470my %DIR = ( 955my %DIR = (
471 SDLK_KP8, [1, "north"], 956 SDLK_KP8, [1, "north"],
472 SDLK_KP9, [2, "northeast"], 957 SDLK_KP9, [2, "northeast"],
… …
516 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1001 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
517 $::CONN->send ("command run_stop"); 1002 $::CONN->send ("command run_stop");
518 } 1003 }
519} 1004}
520 1005
5211; 1006#############################################################################
522 1007
1008package CFClient::Widget::Animator;
1009
1010use SDL::OpenGL;
1011
1012our @ISA = CFClient::Widget::Bin::;
1013
1014sub moveto {
1015 my ($self, $x, $y) = @_;
1016
1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
1018 $self->{speed} = 0.001;
1019 $self->{time} = 1;
1020
1021 ::animation_start $self;
1022}
1023
1024sub animate {
1025 my ($self, $interval) = @_;
1026
1027 $self->{time} -= $interval * $self->{speed};
1028 if ($self->{time} <= 0) {
1029 $self->{time} = 0;
1030 ::animation_stop $self;
1031 }
1032
1033 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
1034
1035 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
1036 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
1037}
1038
1039sub _draw {
1040 my ($self) = @_;
1041
1042 glPushMatrix;
1043 glRotate $self->{time} * 1000, 0, 1, 0;
1044 $self->{children}[0]->draw;
1045 glPopMatrix;
1046}
1047
1048#############################################################################
1049
1050package CFClient::Widget::Toplevel;
1051
1052our @ISA = CFClient::Widget::Container::;
1053
1054sub size_request {
1055 ($::WIDTH, $::HEIGHT)
1056}
1057
1058sub size_allocate {
1059 my ($self, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($w, $h);
1062
1063 $_->size_allocate ($_->size_request)
1064 for @{$self->{children}};
1065}
1066
1067sub translate {
1068 my ($self, $x, $y) = @_;
1069
1070 ($x, $y)
1071}
1072
1073sub update {
1074 my ($self) = @_;
1075
1076 $self->size_allocate ($self->size_request);
1077 ::refresh ();
1078}
1079
1080sub add {
1081 my ($self, $widget) = @_;
1082
1083 $self->SUPER::add ($widget);
1084
1085 $widget->size_allocate ($widget->size_request);
1086}
1087
1088sub draw {
1089 my ($self) = @_;
1090
1091 $self->_draw;
1092}
1093
1094#############################################################################
1095
1096package CFClient::Widget;
1097
1098$TOPLEVEL = new CFClient::Widget::Toplevel;
1099
11001
1101

Diff Legend

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