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

Diff Legend

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