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.41 by root, Sun Apr 9 21:50:21 2006 UTC

5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client;
11
10our $FOCUS; # the widget with current focus 12our $FOCUS; # the widget with current focus
11our @ACTIVE_WIDGETS;
12 13
13# class methods for events 14# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 17sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 18sub feed_sdl_button_up_event { }
18 19
19sub new { 20sub new {
20 my $class = shift; 21 my $class = shift;
21 22
22 bless { @_ }, $class 23 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 24}
36 25
37sub move { 26sub move {
38 my ($self, $x, $y, $z) = @_; 27 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 28 $self->{x} = $x;
44sub needs_redraw { 33sub needs_redraw {
45 0 34 0
46} 35}
47 36
48sub size_request { 37sub size_request {
38 require Carp;
49 die "size_request is abtract"; 39 Carp::confess "size_request is abtract";
40}
41
42sub size_allocate {
43 my ($self, $w, $h) = @_;
44
45 $self->{w} = $w;
46 $self->{h} = $h;
50} 47}
51 48
52sub focus_in { 49sub focus_in {
53 my ($widget) = @_; 50 my ($widget) = @_;
54 $FOCUS = $widget; 51 $FOCUS = $widget;
72 69
73sub button_up { 70sub button_up {
74 my ($widget, $sdlev) = @_; 71 my ($widget, $sdlev) = @_;
75} 72}
76 73
77sub w { $_[0]->{w} } 74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 79
83sub draw { 80sub draw {
88 $self->_draw; 85 $self->_draw;
89 glPopMatrix; 86 glPopMatrix;
90} 87}
91 88
92sub _draw { 89sub _draw {
93 my ($widget) = @_; 90 my ($self) = @_;
91
92 warn "no draw defined for $self\n";
94} 93}
95 94
96sub bbox { 95sub bbox {
97 my ($widget) = @_; 96 my ($self) = @_;
97 my ($w, $h) = $self->size_request;
98 (
99 $self->{x},
100 $self->{y},
101 $self->{x} = $w,
102 $self->{y} = $h
103 )
104}
105
106sub find_widget {
107 my ($self, $x, $y) = @_;
108
109 return $self
110 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112
113 ()
114}
115
116sub del_parent { $_[0]->{parent} = undef }
117
118sub set_parent {
119 my ($self, $par) = @_;
120
121 $self->{parent} = $par;
122 Scalar::Util::weaken $self->{parent};
123}
124
125sub get_parent {
126 $_[0]->{parent}
127}
128
129sub update {
130 my ($self) = @_;
131
132 $self->{parent}->update
133 if $self->{parent};
98} 134}
99 135
100sub DESTROY { 136sub DESTROY {
101 my ($self) = @_; 137 my ($self) = @_;
102 138
103 $self->deactivate; 139 #$self->deactivate;
104} 140}
141
142#############################################################################
105 143
106package Crossfire::Client::Widget::Container; 144package Crossfire::Client::Widget::Container;
107 145
108our @ISA = Crossfire::Client::Widget::; 146our @ISA = Crossfire::Client::Widget::;
109 147
110use SDL::OpenGL; 148sub new {
149 my ($class, @widgets) = @_;
111 150
112sub add { $_[0]->{child} = $_[1] } 151 my $self = $class->SUPER::new (children => []);
152 $self->add ($_) for @widgets;
153
154 $self
155}
156
157sub add {
158 my ($self, $chld, $expand) = @_;
159
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self);
162
163 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld;
166
167 $self->size_allocate ($self->{w}, $self->{h});
168}
169
170sub remove {
171 my ($self, $widget) = @_;
172
173 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
174
175 $self->size_allocate ($self->{w}, $self->{h});
176}
177
178sub find_widget {
179 my ($self, $x, $y) = @_;
180
181 my $res;
182
183 for (@{ $self->{children} }) {
184 $res = $_->find_widget ($x, $y)
185 and return $res;
186 }
187
188 ()
189}
190
191sub size_request {
192 my ($self) = @_;
193
194 my ($hs, $ws) = (0, 0);
195 for (@{$self->{children} || []}) {
196 my ($w, $h) = $_->size_request;
197 $hs += $h;
198 if ($ws < $w) { $ws = $w }
199 }
200
201 return ($ws, $hs);
202}
203
204sub _draw {
205 my ($self) = @_;
206
207 $_->draw for @{$self->{children}};
208}
209
210#############################################################################
211
212package Crossfire::Client::Widget::Bin;
213
214our @ISA = Crossfire::Client::Widget::Container::;
215
113sub get { $_[0]->{child} } 216sub child { $_[0]->{children}[0] }
114 217
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 218sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0];
220}
116 221
117sub _draw { die "Containers can't be drawn!" } 222sub size_allocate {
223 my ($self, $w, $h) = @_;
224 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h)
226 if $self->{children}[0]
227}
228
229#############################################################################
230
231package Crossfire::Client::Widget::Toplevel;
232
233our @ISA = Crossfire::Client::Widget::Container::;
234
235sub update {
236 my ($self) = @_;
237
238 ::refresh ();
239}
240
241#############################################################################
118 242
119package Crossfire::Client::Widget::Window; 243package Crossfire::Client::Widget::Window;
120 244
121our @ISA = Crossfire::Client::Widget::Container::; 245our @ISA = Crossfire::Client::Widget::Bin::;
122 246
123use SDL::OpenGL; 247use SDL::OpenGL;
124 248
125sub add { 249sub add {
126 my ($self, $chld) = @_; 250 my ($self, $chld) = @_;
251 warn "ADD $chld\n";
127 $self->SUPER::add ($chld); 252 $self->SUPER::add ($chld);
253 $chld->set_parent ($self);
254}
255
256sub remove {
257 my ($self) = @_;
258 # TODO FIXME: removing a child from a window will crash, see render_chld
259 # $self->update;
260}
261
262sub update {
263 my ($self) = @_;
128 $self->render_chld; 264 $self->render_chld;
129} 265}
130 266
131sub render_chld { 267sub render_chld {
132 my ($self) = @_; 268 my ($self) = @_;
133 my $chld = $self->get; 269 my $chld = $self->get;
134 my ($w, $h) = $self->size_request; 270 my ($w, $h) = $self->size_request;
135 271
272 require Carp;
273 Carp::cluck "RENDERCHI $w $h";
274 warn "RENDERCHI $w $h\n";
136 $self->{texture} = 275 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 276 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 277 $w, $h, sub { $chld->draw }
139 ); 278 );
140 $self->{texture}->upload; 279 $self->{texture}->upload;
141} 280}
142 281
143sub size_request { 282sub size_request {
144 my ($self) = @_; 283 my ($self) = @_;
145 my $chld = $self->get 284 ($self->w, $self->h)
146 or return (0, 0); 285}
147 $chld->size_request 286
287sub size_allocate {
288 my ($self, $w, $h) = @_;
289
290 $self->w ($w);
291 $self->h ($h);
292 $self->get->size_allocate ($w, $h);
293
294 $self->update; #TODO: Move this to the size_request event propably?
148} 295}
149 296
150sub _draw { 297sub _draw {
151 my ($self) = @_; 298 my ($self) = @_;
152 299
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 300 my ($w, $h) = ($self->w, $self->h);
301
154 my $tex = $self->{texture} 302 my $tex = $self->{texture}
155 or return; 303 or return;
156 304
157 glEnable GL_BLEND; 305 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 306 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name}; 308 glBindTexture GL_TEXTURE_2D, $tex->{name};
161
162 glColor 1, 1, 1;
163 309
164 glBegin GL_QUADS; 310 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0; 311 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h; 312 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h; 313 glTexCoord 1, 1; glVertex $w, $h;
170 316
171 glDisable GL_BLEND; 317 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 318 glDisable GL_TEXTURE_2D;
173} 319}
174 320
321#############################################################################
322
175package Crossfire::Client::Widget::Frame; 323package Crossfire::Client::Widget::Frame;
176 324
177our @ISA = Crossfire::Client::Widget::Container::; 325our @ISA = Crossfire::Client::Widget::Bin::;
178 326
179use SDL::OpenGL; 327use SDL::OpenGL;
180 328
181sub size_request { 329sub size_request {
182 my ($self) = @_; 330 my ($self) = @_;
183 my $chld = $self->get 331 my $chld = $self->child
184 or return (0, 0); 332 or return (0, 0);
333
334 $chld->move (2, 2);
335
185 map { $_ + 4 } $chld->size_request; 336 map { $_ + 4 } $chld->size_request;
186} 337}
187 338
339sub size_allocate {
340 my ($self, $w, $h) = @_;
341
342 $self->SUPER::size_allocate ($w, $h);
343
344 $self->child->size_allocate ($w - 4, $h - 4);
345 $self->child->move (2, 2);
346}
347
188sub _draw { 348sub _draw {
189 my ($self) = @_; 349 my ($self) = @_;
190 350
191 my $chld = $self->get; 351 my $chld = $self->child;
192 352
193 my ($w, $h) = $chld->size_request; 353 my ($w, $h) = $chld->size_request;
194 354
195 glColor 1, 0, 0;
196 glBegin GL_QUADS; 355 glBegin GL_QUADS;
356 glColor 0, 0, 0;
197 glTexCoord 0, 0; glVertex 0 , 0; 357 glTexCoord 0, 0; glVertex 0 , 0;
198 glTexCoord 0, 1; glVertex 0 , $h + 4; 358 glTexCoord 0, 1; glVertex 0 , $h + 4;
199 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 359 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
200 glTexCoord 1, 0; glVertex $w + 4 , 0; 360 glTexCoord 1, 0; glVertex $w + 4 , 0;
201 glEnd; 361 glEnd;
202 362
203 glPushMatrix;
204 glTranslate (2, 2, 0);
205 $chld->draw; 363 $chld->draw;
206 glPopMatrix;
207} 364}
365
366#############################################################################
367
368package Crossfire::Client::Widget::FancyFrame;
369
370our @ISA = Crossfire::Client::Widget::Bin::;
371
372use SDL::OpenGL;
373
374my @tex =
375 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
376 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
377
378sub size_request {
379 my ($self) = @_;
380
381 my ($w, $h) = $self->SUPER::size_request;
382
383 $h += $tex[1]->{height};
384 $h += $tex[4]->{height};
385 $w += $tex[2]->{width};
386 $w += $tex[3]->{width};
387
388 ($w, $h)
389}
390
391sub size_allocate {
392 my ($self, $w, $h) = @_;
393
394 $self->SUPER::size_allocate ($w, $h);
395
396 $h -= $tex[1]->{height};
397 $h -= $tex[4]->{height};
398 $w -= $tex[2]->{width};
399 $w -= $tex[3]->{width};
400
401 $h = $h < 0 ? 0 : $h;
402 $w = $w < 0 ? 0 : $w;
403 warn "CHILD:$w $h\n";
404 $self->child->size_allocate ($w, $h);
405 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
406}
407
408sub _draw {
409 my ($self) = @_;
410
411 my ($w, $h) = ($self->w, $self->h);
412 my ($cw, $ch) = ($self->child->w, $self->child->h);
413
414 glEnable GL_BLEND;
415 glEnable GL_TEXTURE_2D;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
418
419 my $top = $tex[1];
420 glBindTexture GL_TEXTURE_2D, $top->{name};
421
422 glBegin GL_QUADS;
423 glTexCoord 0, 0; glVertex 0 , 0;
424 glTexCoord 0, 1; glVertex 0 , $top->{height};
425 glTexCoord 1, 1; glVertex $w , $top->{height};
426 glTexCoord 1, 0; glVertex $w , 0;
427 glEnd;
428
429 my $left = $tex[3];
430 glBindTexture GL_TEXTURE_2D, $left->{name};
431
432 glBegin GL_QUADS;
433 glTexCoord 0, 0; glVertex 0 , $top->{height};
434 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
435 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
436 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
437 glEnd;
438
439 my $right = $tex[2];
440 glBindTexture GL_TEXTURE_2D, $right->{name};
441
442 glBegin GL_QUADS;
443 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
444 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
445 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
446 glTexCoord 1, 0; glVertex $w , $top->{height};
447 glEnd;
448
449 my $bottom = $tex[4];
450 glBindTexture GL_TEXTURE_2D, $bottom->{name};
451
452 glBegin GL_QUADS;
453 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
454 glTexCoord 0, 1; glVertex 0 , $h;
455 glTexCoord 1, 1; glVertex $w , $h;
456 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
457 glEnd;
458
459 my $bg = $tex[0];
460 glBindTexture GL_TEXTURE_2D, $bg->{name};
461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
462 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
463 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
464
465 my $rep_x = $cw / $bg->{width};
466 my $rep_y = $ch / $bg->{height};
467
468 glBegin GL_QUADS;
469 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
470 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
471 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
472 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
473 glEnd;
474
475 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477
478 $self->child->draw;
479
480}
481
482#############################################################################
208 483
209package Crossfire::Client::Widget::Table; 484package Crossfire::Client::Widget::Table;
210 485
211our @ISA = Crossfire::Client::Widget::Container::; 486our @ISA = Crossfire::Client::Widget::Bin::;
212 487
213use SDL::OpenGL; 488use SDL::OpenGL;
214 489
215sub add { 490sub add {
216 my ($self, $x, $y, $chld) = @_; 491 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493
217 $self->{childs}[$y][$x] = $chld; 494 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self);
496 $self->update;
218} 497}
219 498
220sub max_row_height { 499sub max_row_height {
221 my ($self, $row) = @_; 500 my ($self, $row) = @_;
222 501
223 my $hs = 0; 502 my $hs = 0;
224 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
225 my $c = $self->{childs}->[$row]->[$xi]; 504 my $c = $self->{children}->[$row]->[$xi];
226 if ($c) { 505 if ($c) {
227 my ($w, $h) = $c->size_request; 506 my ($w, $h) = $c->size_request;
228 if ($hs < $h) { $hs = $h } 507 if ($hs < $h) { $hs = $h }
229 } 508 }
230 } 509 }
233 512
234sub max_col_width { 513sub max_col_width {
235 my ($self, $col) = @_; 514 my ($self, $col) = @_;
236 515
237 my $ws = 0; 516 my $ws = 0;
238 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
239 my $c = ($self->{childs}->[$yi] || [])->[$col]; 518 my $c = ($self->{children}->[$yi] || [])->[$col];
240 if ($c) { 519 if ($c) {
241 my ($w, $h) = $c->size_request; 520 my ($w, $h) = $c->size_request;
242 if ($ws < $w) { $ws = $w } 521 if ($ws < $w) { $ws = $w }
243 } 522 }
244 } 523 }
248sub size_request { 527sub size_request {
249 my ($self) = @_; 528 my ($self) = @_;
250 529
251 my ($hs, $ws) = (0, 0); 530 my ($hs, $ws) = (0, 0);
252 531
253 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
254 $hs += $self->max_row_height ($yi); 533 $hs += $self->max_row_height ($yi);
255 } 534 }
256 535
257 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
258 my $wm = 0; 537 my $wm = 0;
259 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
260 $wm += $self->max_col_width ($xi) 539 $wm += $self->max_col_width ($xi)
261 } 540 }
262 if ($ws < $wm) { $ws = $wm } 541 if ($ws < $wm) { $ws = $wm }
263 } 542 }
264 543
267 546
268sub _draw { 547sub _draw {
269 my ($self) = @_; 548 my ($self) = @_;
270 549
271 my $y = 0; 550 my $y = 0;
272 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
273 my $x = 0; 552 my $x = 0;
274 553
275 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
276 555
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]; 556 my $c = $self->{children}->[$yi]->[$xi];
557 if ($c) {
558 $c->move ($x, $y, 0); #TODO: Move to size_request
280 $c->draw if $c; 559 $c->draw if $c;
281 glPopMatrix; 560 }
282 561
283 $x += $self->max_col_width ($xi); 562 $x += $self->max_col_width ($xi);
284 } 563 }
285 564
286 $y += $self->max_row_height ($yi); 565 $y += $self->max_row_height ($yi);
287 } 566 }
288} 567}
289 568
569#############################################################################
570
290package Crossfire::Client::Widget::VBox; 571package Crossfire::Client::Widget::VBox;
291 572
292our @ISA = Crossfire::Client::Widget::Container::; 573our @ISA = Crossfire::Client::Widget::Container::;
293 574
294use SDL::OpenGL; 575use SDL::OpenGL;
295 576
296sub add { 577sub size_allocate {
297 my ($self, $chld) = @_; 578 my ($self, $w, $h) = @_;
298 push @{$self->{childs}}, $chld;
299}
300 579
301sub size_request { 580 $self->w ($w);
302 my ($self) = @_; 581 $self->h ($h);
303 582
304 my ($hs, $ws) = (0, 0); 583 my $exp;
584 my @oth;
585 # find expand widget
305 for (@{$self->{childs} || []}) { 586 for (@{$self->{children}}) {
587 if ($_->{expand}) {
588 $exp = $_;
589 last;
590 }
591 push @oth, $_;
592 }
593
594 my ($ow, $oh);
595
596 # get sizes of other widgets
597 for (@oth) {
306 my ($w, $h) = $_->size_request; 598 my ($w, $h) = $_->size_request;
307 $hs += $h; 599 $oh += $h;
308 if ($ws < $w) { $ws = $w } 600 if ($ow < $w) { $ow = $w }
309 } 601 }
310 602
311 return ($ws, $hs); 603 my $y = 0;
604 for (@{$self->{children}}) {
605 $_->move (0, $y);
606
607 if ($_ == $exp) {
608 $_->size_allocate ($w, $h - $oh);
609 $y += $h - $oh;
610 } else {
611 my ($cw, $h) = $_->size_request;
612 $_->size_allocate ($w, $h);
613 $y += $h;
614 }
615 }
312} 616}
313 617
314sub _draw { 618sub _draw {
315 my ($self) = @_; 619 my ($self) = @_;
316 620
317 my ($x, $y); 621 my ($x, $y);
318 for (@{$self->{childs} || []}) { 622 for (@{$self->{children} || []}) {
319 glPushMatrix;
320 glTranslate (0, $y, 0);# see above TODO
321 $_->draw; 623 $_->draw;
322 glPopMatrix;
323 my ($w, $h) = $_->size_request;
324 $y += $h; 624 $y += $_->h;
325 } 625 }
326} 626}
627
628#############################################################################
327 629
328package Crossfire::Client::Widget::Label; 630package Crossfire::Client::Widget::Label;
329 631
330our @ISA = Crossfire::Client::Widget::; 632our @ISA = Crossfire::Client::Widget::;
331 633
332use SDL::OpenGL; 634use SDL::OpenGL;
333 635
334sub new { 636sub new {
335 my ($class, $x, $y, $z, $ttf, $text) = @_; 637 my ($class, $x, $y, $z, $height, $text) = @_;
336 638
639 # TODO: color, and make height, xyz etc. optional
337 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 640 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
338 641
339 $self->set_text ($text); 642 $self->set_text ($text);
340 643
341 $self 644 $self
342} 645}
343 646
344sub set_text { 647sub set_text {
345 my ($self, $text) = @_; 648 my ($self, $text) = @_;
649
650 $self->{text} = $text;
346 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 651 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
652
653 $self->update;
347} 654}
348 655
349sub get_text { 656sub get_text {
350 my ($self, $text) = @_; 657 my ($self, $text) = @_;
658
351 $self->{text} 659 $self->{text}
352} 660}
353 661
354sub size_request { 662sub size_request {
355 my ($self) = @_; 663 my ($self) = @_;
365 673
366 my $tex = $self->{texture}; 674 my $tex = $self->{texture};
367 675
368 glEnable GL_BLEND; 676 glEnable GL_BLEND;
369 glEnable GL_TEXTURE_2D; 677 glEnable GL_TEXTURE_2D;
678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
371 glBindTexture GL_TEXTURE_2D, $tex->{name}; 680 glBindTexture GL_TEXTURE_2D, $tex->{name};
372 681
373 glColor 1, 1, 1; 682 glColor 1, 0, 0, 1; # TODO color
374 683
375 glBegin GL_QUADS; 684 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0; 685 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 686 glTexCoord 0, 1; glVertex 0 , $tex->{height};
378 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 687 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
381 690
382 glDisable GL_BLEND; 691 glDisable GL_BLEND;
383 glDisable GL_TEXTURE_2D; 692 glDisable GL_TEXTURE_2D;
384} 693}
385 694
695#############################################################################
696
386package Crossfire::Client::Widget::TextView; 697package Crossfire::Client::Widget::TextEntry;
698
699our @ISA = Crossfire::Client::Widget::Label::;
700
701use SDL;
702use SDL::OpenGL;
703
704sub key_down {
705 my ($self, $ev) = @_;
706
707 my $mod = $ev->key_mod;
708 my $sym = $ev->key_sym;
709
710 $ev->set_unicode (1);
711 my $uni = $ev->key_unicode;
712
713 my $text = $self->get_text;
714
715 if ($sym == SDLK_BACKSPACE) {
716 substr $text, -1, 1, '';
717
718 } elsif ($uni) {
719 $text .= chr $uni;
720 }
721 $self->set_text ($text);
722}
723
724#############################################################################
725
726package Crossfire::Client::Widget::MapWidget;
387 727
388use strict; 728use strict;
389 729
390our @ISA = qw/Crossfire::Client::Widget/; 730use 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 731
411use SDL; 732use SDL;
412use SDL::OpenGL; 733use SDL::OpenGL;
413use SDL::OpenGL::Constants; 734use SDL::OpenGL::Constants;
414 735
736our @ISA = Crossfire::Client::Widget::;
737
415sub key_down { 738sub key_down {
416 print "MAPKEYDOWN\n"; 739 print "MAPKEYDOWN\n";
417} 740}
418 741
419sub key_up { 742sub key_up {
420} 743}
421 744
745sub size_request {
746
747}
748
749sub size_allocate {
750}
751
422sub _draw { 752sub _draw {
423 my ($self) = @_; 753 my ($self) = @_;
754
755 my $mx = $::CONN->{mapx};
756 my $my = $::CONN->{mapy};
757
758 my $map = $::CONN->{map};
759
760 my ($xofs, $yofs);
761
762 my $sw = 1 + int $::WIDTH / 32;
763 my $sh = 1 + int $::HEIGHT / 32;
764
765 if ($::CONN->{mapw} > $sw) {
766 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
767 } else {
768 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
769 }
770
771 if ($::CONN->{maph} > $sh) {
772 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
773 } else {
774 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
775 }
424 776
425 glEnable GL_TEXTURE_2D; 777 glEnable GL_TEXTURE_2D;
426 glEnable GL_BLEND; 778 glEnable GL_BLEND;
427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
428 780
429 my $map = $::CONN->{map}; 781 my $sw4 = ($sw + 3) & ~3;
782 my $lighting = "\x00" x ($sw4 * $sh);
430 783
431 for my $x (0 .. int $::WIDTH / 32) { 784 for my $x (0 .. $sw - 1) {
432 for my $y (0 .. int $::HEIGHT / 32) { 785 for my $y (0 .. $sh - 1) {
433 786
434 my $cell = $map->[$x + $::CONN->{mapx}] 787 my $cell = $map->[$x + $xofs][$y + $yofs]
435 [$y + $::CONN->{mapy}]
436 or next; 788 or next;
437 789
438 my $darkness = $cell->[0] * (1 / 255); 790 my $darkness = $cell->[0] * (1 / 255);
439 if ($darkness < 0) { 791 if ($darkness < 0) {
440 glColor 0.3, 0.3, 0.3; 792 $darkness = 0.15;
441 } else {
442 glColor $darkness, $darkness, $darkness;
443 } 793 }
794 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
444 795
445 for my $num (grep $_, @$cell[1,2,3]) { 796 for my $num (grep $_, @$cell[1,2,3]) {
446 my $tex = $::CONN->{face}[$num]{texture} || next; 797 my $tex = $::CONN->{face}[$num]{texture} || next;
447 798
448 glBindTexture GL_TEXTURE_2D, $tex->{name}; 799 glBindTexture GL_TEXTURE_2D, $tex->{name};
460 glTexCoord 1, 0; glVertex $px + $w, $py; 811 glTexCoord 1, 0; glVertex $px + $w, $py;
461 glEnd; 812 glEnd;
462 } 813 }
463 } 814 }
464 } 815 }
816
817# if (1) { # higher quality darkness
818# $lighting =~ s/(.)/$1$1$1/gs;
819# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
820#
821# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
822#
823# $lighting = $pb->get_pixels;
824# $lighting =~ s/(.)../$1/gs;
825# }
826
827 $lighting = new Crossfire::Client::Texture
828 width => $sw4,
829 height => $sh,
830 data => $lighting,
831 internalformat => GL_ALPHA4,
832 format => GL_ALPHA;
833
834 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
835 glColor 0, 0, 0, 0.75;
836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
837 glBindTexture GL_TEXTURE_2D, $lighting->{name};
838 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
839 glBegin GL_QUADS;
840 glTexCoord 0, 0; glVertex 0 , 0;
841 glTexCoord 0, 1; glVertex 0 , $sh * 32;
842 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
843 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
844 glEnd;
465 845
466 glDisable GL_TEXTURE_2D; 846 glDisable GL_TEXTURE_2D;
467 glDisable GL_BLEND; 847 glDisable GL_BLEND;
468} 848}
469 849
516 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 896 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
517 $::CONN->send ("command run_stop"); 897 $::CONN->send ("command run_stop");
518 } 898 }
519} 899}
520 900
901#############################################################################
902
903package Crossfire::Client::Widget::Animator;
904
905use SDL::OpenGL;
906
907our @ISA = Crossfire::Client::Widget::Bin::;
908
909sub moveto {
910 my ($self, $x, $y) = @_;
911
912 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
913 $self->{speed} = 0.2;
914 $self->{time} = 1;
915
916 ::animation_start $self;
917}
918
919sub animate {
920 my ($self, $interval) = @_;
921
922 $self->{time} -= $interval * $self->{speed};
923 if ($self->{time} <= 0) {
924 $self->{time} = 0;
925 ::animation_stop $self;
926 }
927
928 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
929
930 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
931 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
932}
933
934sub _draw {
935 my ($self) = @_;
936
937 glPushMatrix;
938 glRotate $self->{time} * 10000, 0, 1, 0;
939 $self->{children}[0]->draw;
940 glPopMatrix;
941}
942
5211; 9431;
522 944

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines